summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-04-15 22:04:53 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-04-15 22:04:53 +0000
commit07cd648f3f34e0dac42304e16e2ecb7d992a2859 (patch)
tree6c186445ebcc8ab4334c2eaac1ef9ce00a31e8ff /lib/sqlalchemy/sql.py
parentad39d4fc1cea4de1ab14341bdfc0e6d833edacfe (diff)
downloadsqlalchemy-07cd648f3f34e0dac42304e16e2ecb7d992a2859.tar.gz
- got unicode schemas to work with postgres
- unicode schema with mysql slightly improved, still cant do has_table - got reflection of unicode schemas working with sqlite, pg, mysql
Diffstat (limited to 'lib/sqlalchemy/sql.py')
-rw-r--r--lib/sqlalchemy/sql.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index d912ca176..94b618491 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -1521,7 +1521,7 @@ class ClauseList(ClauseElement):
def append(self, clause):
if _is_literal(clause):
- clause = _TextClause(str(clause))
+ clause = _TextClause(unicode(clause))
self.clauses.append(clause)
def get_children(self, **kwargs):
@@ -2042,7 +2042,7 @@ class _ColumnClause(ColumnElement):
def __init__(self, text, selectable=None, type=None, _is_oid=False, case_sensitive=True, is_literal=False):
self.key = self.name = text
- self.encodedname = self.name.encode('ascii', 'backslashreplace')
+ self.encodedname = isinstance(self.name, unicode) and self.name.encode('ascii', 'backslashreplace') or self.name
self.table = selectable
self.type = sqltypes.to_instance(type)
self._is_oid = _is_oid
@@ -2346,6 +2346,10 @@ class Select(_SelectBaseMixin, FromClause):
for c in columns:
self.append_column(c)
+ if order_by:
+ order_by = util.to_list(order_by)
+ if group_by:
+ group_by = util.to_list(group_by)
self.order_by(*(order_by or [None]))
self.group_by(*(group_by or [None]))
for c in self.order_by_clause: