From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 12 Jun 2006 19:53:42 +0000 (+0000)
Subject: adjustment to better allow textual from clauses
X-Git-Tag: rel_0_2_3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f8459c313163f46a0bcccc6cd8eda1fd2058d57;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

adjustment to better allow textual from clauses
---

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 7ac28babe7..0cacea12d0 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -825,7 +825,7 @@ class TextClause(ClauseElement):
         if bindparams is not None:
             for b in bindparams:
                 self.bindparams[b.key] = b
-            
+    columns = property(lambda s:[])        
     def accept_visitor(self, visitor): 
         for item in self.bindparams.values():
             item.accept_visitor(visitor)
@@ -1489,7 +1489,7 @@ class Select(SelectBaseMixin, FromClause):
         
     def append_from(self, fromclause):
         if type(fromclause) == str:
-            fromclause = FromClause(from_name = fromclause)
+            fromclause = TextClause(fromclause)
         fromclause.accept_visitor(self._correlator)
         fromclause._process_from_dict(self._froms, True)
     def _locate_oid_column(self):