From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 4 Sep 2008 20:41:51 +0000 (+0000)
Subject: allow the no_criterion call in _get() to copy the method name thorugh
X-Git-Tag: rel_0_5rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c586c0fe892510a853168391ccb5528516dc56da;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

allow the no_criterion call in _get() to copy the method name thorugh
---

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 0abf477ad6..d02432c260 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -47,7 +47,7 @@ def _generative(*assertions):
     @util.decorator
     def generate(fn, *args, **kw):
         self = args[0]._clone()
-        fn_name = fn.func_name
+        fn_name = kw.pop('generative_name', fn.func_name)
         for assertion in assertions:
             assertion(self, fn_name)
         fn(self, *args[1:], **kw)
@@ -292,7 +292,7 @@ class Query(object):
             )
 
     @_generative(__no_criterion_condition)
-    def __no_criterion(self):
+    def __no_criterion(self, generative_name=None):
         """generate a Query with no criterion, warn if criterion was present"""
 
     def __get_options(self, populate_existing=None, version_check=None, only_load_props=None, refresh_state=None):
@@ -1151,7 +1151,7 @@ class Query(object):
             ident = util.to_list(ident)
 
         if refresh_state is None:
-            q = self.__no_criterion()
+            q = self.__no_criterion(generative_name="get")
         else:
             q = self._clone()