summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-04-29 16:08:36 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-04-29 16:08:36 +0000
commitc0f391af951ab75a1c486d4179216d31997a0f83 (patch)
treedc90d3214bd1c8c42e5f1acd7d8303739eafccde /lib/sqlalchemy/sql.py
parentbb991b972d3c76f9f2528916a77ff893cd433f99 (diff)
downloadsqlalchemy-c0f391af951ab75a1c486d4179216d31997a0f83.tar.gz
- fixed textual select elements that got broke the other day
- docstring work
Diffstat (limited to 'lib/sqlalchemy/sql.py')
-rw-r--r--lib/sqlalchemy/sql.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index f4ece3d6b..9c327bd53 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -1342,7 +1342,17 @@ class _CompareMixin(object):
return obj.type
class Selectable(ClauseElement):
- """Represent a column list-holding object."""
+ """Represent a column list-holding object.
+
+ this is the common base class of [sqlalchemy.sql#ColumnElement]
+ and [sqlalchemy.sql#FromClause]. The reason ``ColumnElement``
+ is marked as a "list-holding" object is so that it can be treated
+ similarly to ``FromClause`` in column-selection scenarios; it
+ contains a list of columns consisting of itself.
+
+ """
+
+ columns = util.NotImplProperty("""a [sqlalchemy.sql#ColumnCollection] containing ``ColumnElement`` instances.""")
def _selectable(self):
return self
@@ -2792,7 +2802,7 @@ class Select(_SelectBaseMixin, FromClause):
def append_column(self, column):
if _is_literal(column):
- column = literal_column(str(column), table=self)
+ column = literal_column(str(column))
self._raw_columns.append(column)