From feda8a7db8d1d7c5439aa8f8feef7cc0dd2b59a0 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Fri, 27 Jul 2018 23:51:12 -0400
Subject: New upstream version 3.2.1+dfsg1

---
 SQLiteStudio3/coreSQLiteStudio/selectresolver.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'SQLiteStudio3/coreSQLiteStudio/selectresolver.h')

diff --git a/SQLiteStudio3/coreSQLiteStudio/selectresolver.h b/SQLiteStudio3/coreSQLiteStudio/selectresolver.h
index 7640fc6..92924ea 100644
--- a/SQLiteStudio3/coreSQLiteStudio/selectresolver.h
+++ b/SQLiteStudio3/coreSQLiteStudio/selectresolver.h
@@ -5,6 +5,7 @@
 #include "common/bistrhash.h"
 #include "dialect.h"
 #include "expectedtoken.h"
+#include "parser/ast/sqlitewith.h"
 #include <QString>
 #include <QHash>
 #include <QStringList>
@@ -106,7 +107,6 @@ class API_EXPORT SelectResolver
             QString alias;
             QString displayName;
             bool aliasDefinedInSubQuery = false;
-            int flags = 0;
             SqliteSelect::Core::ResultColumn* originalColumn = nullptr;
 
             int operator==(const Column& other);
@@ -204,6 +204,7 @@ class API_EXPORT SelectResolver
 
         QList<Column> resolveJoinSource(SqliteSelect::Core::JoinSource* joinSrc);
         QList<Column> resolveSingleSource(SqliteSelect::Core::SingleSource* joinSrc);
+        QList<Column> resolveTableFunctionColumns(SqliteSelect::Core::SingleSource* joinSrc);
         QList<Column> resolveSingleSourceSubSelect(SqliteSelect::Core::SingleSource* joinSrc);
         QList<Column> resolveOtherSource(SqliteSelect::Core::JoinSourceOther *otherSrc);
         QList<Column> resolveSubSelect(SqliteSelect* select);
@@ -216,16 +217,19 @@ class API_EXPORT SelectResolver
 
         void markDistinctColumns();
         void markCompoundColumns();
-        void markCteColumns();
+        void markCteColumns(QList<Column>* columnList = nullptr);
         void markGroupedColumns();
         void fixColumnNames();
-        void markCurrentColumnsWithFlag(Flag flag);
+        void markCurrentColumnsWithFlag(Flag flag, QList<Column>* columnList = nullptr);
         bool matchTable(const Column& sourceColumn, const QString& table);
         TokenList getResColTokensWithoutAlias(SqliteSelect::Core::ResultColumn *resCol);
+        void extractCte(SqliteSelect* select);
+        void extractCte(SqliteSelect::Core* core);
 
         Db* db = nullptr;
         QString query;
         SqliteSelectPtr originalQueryParsed;
+        QHash<QString, SqliteWith::CommonTableExpression*> cteList;
 
         /**
          * @brief Database name to attach name map.
-- 
cgit v1.2.3