From 2fad6acf54241df43030d387c7c9ac3f54df3af5 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 28 Sep 2006 04:53:00 +0000 Subject: - 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 --- lib/sqlalchemy/sql.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lib/sqlalchemy/sql.py') 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 -- cgit v1.2.1