summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-09-28 04:53:00 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-09-28 04:53:00 +0000
commit2fad6acf54241df43030d387c7c9ac3f54df3af5 (patch)
tree6e71ac9fb1f439bb5dcdc52785a6df6f4b3d02df /lib/sqlalchemy/sql.py
parent93caa5da2e2174e5a5f059269fcd9eae66f69306 (diff)
downloadsqlalchemy-2fad6acf54241df43030d387c7c9ac3f54df3af5.tar.gz
- added test suite to test improved from_obj/join behavior with Query/eagerloading/SelectResults
- EagerLoader looks more carefully for the correct Table/Join/FromClause to bind its outer join onto - sqlite boolean datatype converts bind params from python booleans to integer - took out assertion raise from 'name' property of CompoundSelect
Diffstat (limited to 'lib/sqlalchemy/sql.py')
-rw-r--r--lib/sqlalchemy/sql.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 9c04cdfcb..89688cbfe 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -1362,10 +1362,7 @@ class CompoundSelect(SelectBaseMixin, FromClause):
self.order_by(*kwargs.get('order_by', [None]))
self._col_map = {}
-# name = property(lambda s:s.keyword + " statement")
- def _foo(self):
- raise "this is a temporary assertion while we refactor SQL to not call 'name' on non-table Selectables"
- name = property(lambda s:s._foo()) #"SELECT statement")
+ name = property(lambda s:s.keyword + " statement")
def _locate_oid_column(self):
return self.selects[0].oid_column
@@ -1576,7 +1573,7 @@ class UpdateBase(ClauseElement):
"""forms the base for INSERT, UPDATE, and DELETE statements."""
def _process_colparams(self, parameters):
"""receives the "values" of an INSERT or UPDATE statement and constructs
- appropriate ind parameters."""
+ appropriate bind parameters."""
if parameters is None:
return None