From 4870a41d277ef8638dd06d23ba20a69acf073739 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 15 Jan 2008 02:34:17 +0000 Subject: - select_table mapper turns straight join into aliased select + custom PK, to allow joins onto select_table mappers - starting a generalized reduce_columns func --- lib/sqlalchemy/sql/expression.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/sqlalchemy/sql/expression.py') diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 4eb555d4d..be870ee79 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2178,11 +2178,19 @@ class Join(FromClause): self._foreign_keys = util.Set() columns = list(self._flatten_exportable_columns()) + + #global sql_util + #if not sql_util: + # from sqlalchemy.sql import util as sql_util + #self._primary_key = sql_util.reduce_columns([c for c in columns if c.primary_key], self.onclause) + self.__init_primary_key(columns) + for co in columns: cp = self._proxy_column(co) def __init_primary_key(self, columns): + # TODO !!! remove all this global schema if schema is None: from sqlalchemy import schema -- cgit v1.2.1