diff options
Diffstat (limited to 'lib/sqlalchemy/ext')
| -rw-r--r-- | lib/sqlalchemy/ext/baked.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/ext/compiler.py | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/sqlalchemy/ext/baked.py b/lib/sqlalchemy/ext/baked.py index 7ac556dcc..f95a30fda 100644 --- a/lib/sqlalchemy/ext/baked.py +++ b/lib/sqlalchemy/ext/baked.py @@ -228,7 +228,7 @@ class BakedQuery(object): # in 1.4, this is where before_compile() event is # invoked - statement = query._statement_20(orm_results=True) + statement = query._statement_20() # if the query is not safe to cache, we still do everything as though # we did cache it, since the receiver of _bake() assumes subqueryload diff --git a/lib/sqlalchemy/ext/compiler.py b/lib/sqlalchemy/ext/compiler.py index 32975a949..7736a1290 100644 --- a/lib/sqlalchemy/ext/compiler.py +++ b/lib/sqlalchemy/ext/compiler.py @@ -401,7 +401,6 @@ Example usage:: from .. import exc from .. import util from ..sql import sqltypes -from ..sql import visitors def compiles(class_, *specs): @@ -456,12 +455,12 @@ def compiles(class_, *specs): def deregister(class_): """Remove all custom compilers associated with a given - :class:`_expression.ClauseElement` type.""" + :class:`_expression.ClauseElement` type. + + """ if hasattr(class_, "_compiler_dispatcher"): - # regenerate default _compiler_dispatch - visitors._generate_compiler_dispatch(class_) - # remove custom directive + class_._compiler_dispatch = class_._original_compiler_dispatch del class_._compiler_dispatcher |