From: mike bayer <mike_mp@zzzcomputing.com>
Date: Wed, 11 Mar 2020 18:08:03 +0000 (+0000)
Subject: Merge "Rework select(), CompoundSelect() in terms of CompileState"
X-Git-Tag: rel_1_4_0b1~471
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2aa9a8043b4982d4d7b53e8b11371ea27fccd09c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge "Rework select(), CompoundSelect() in terms of CompileState"
---

2aa9a8043b4982d4d7b53e8b11371ea27fccd09c
diff --cc lib/sqlalchemy/sql/selectable.py
index 5536b27bc4,ae11f680cb..45b9e7f9dc
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@@ -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)
              )
          )