diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-01-15 02:34:17 +0000 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-01-15 02:34:17 +0000 |
commit | 4870a41d277ef8638dd06d23ba20a69acf073739 (patch) | |
tree | b896d5ac657c949e49b6ffb1a1b65f0b295989b0 /lib/sqlalchemy/sql/expression.py | |
parent | 868a0584bacd26f7b7cb26c4d496af1c1c5affac (diff) | |
download | sqlalchemy-4870a41d277ef8638dd06d23ba20a69acf073739.tar.gz |
- select_table mapper turns straight join into aliased select + custom PK, to allow
joins onto select_table mappers
- starting a generalized reduce_columns func
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r-- | lib/sqlalchemy/sql/expression.py | 8 |
1 files changed, 8 insertions, 0 deletions
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 |