]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge "Rework select(), CompoundSelect() in terms of CompileState"
authormike bayer <mike_mp@zzzcomputing.com>
Wed, 11 Mar 2020 18:08:03 +0000 (18:08 +0000)
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>
Wed, 11 Mar 2020 18:08:03 +0000 (18:08 +0000)
1  2 
lib/sqlalchemy/sql/base.py
lib/sqlalchemy/sql/compiler.py
lib/sqlalchemy/sql/elements.py
lib/sqlalchemy/sql/selectable.py
lib/sqlalchemy/sql/traversals.py
test/profiles.txt

Simple merge
Simple merge
Simple merge
index 5536b27bc4c3f25d74fffaf4b17572652c3b11d6,ae11f680cb1f5651b26e8ac2c5a3795c0ebaee6f..45b9e7f9dc940dec3269959ac354e546598bb508
@@@ -3886,10 -3710,10 +3709,10 @@@ class Select
  
          """
          return self.with_only_columns(
 -            sqlutil.reduce_columns(
 +            util.preloaded.sql_util.reduce_columns(
                  self.inner_columns,
                  only_synonyms=only_synonyms,
-                 *(self._whereclause,) + tuple(self._from_obj)
+                 *(self._where_criteria + self._from_obj)
              )
          )
  
Simple merge
Simple merge