From 9fffa2c7e1539689750ead7cd70f2d4812322a77 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 12 Feb 2008 21:16:31 +0000 Subject: - fixed bug introduced in r4070 where union() and other compound selects would not get an OID column if it only contained one selectable element, due to missing return in _proxy_column() - visit_column() calls itself to render a primary key col being used as the interpretation of the oid col instead of relying upon broken partial logic --- lib/sqlalchemy/sql/compiler.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/sqlalchemy/sql/compiler.py') diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 02f6efce1..e87d3d2fb 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -269,8 +269,7 @@ class DefaultCompiler(engine.Compiled): return schema_prefix + self.preparer.quote(column.table, ANONYMOUS_LABEL.sub(self._process_anon, column.table.name)) + "." + n elif len(column.table.primary_key) != 0: pk = list(column.table.primary_key)[0] - pkname = (pk.is_literal and name or self._truncated_identifier("colident", pk.name)) - return schema_prefix + self.preparer.quote(column.table, ANONYMOUS_LABEL.sub(self._process_anon, column.table.name)) + "." + self.preparer.quote(pk, pkname) + return self.visit_column(pk, result_map=result_map, use_schema=use_schema, **kwargs) else: return None elif column.table is None or not column.table.named_with_column: -- cgit v1.2.1