From 1fdc150116cad39aae5c5da407c3312b47a59e3a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Fri, 17 Dec 2021 07:06:30 -0500 Subject: New upstream version 3.3.3+dfsg1. --- SQLiteStudio3/coreSQLiteStudio/selectresolver.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'SQLiteStudio3/coreSQLiteStudio/selectresolver.h') diff --git a/SQLiteStudio3/coreSQLiteStudio/selectresolver.h b/SQLiteStudio3/coreSQLiteStudio/selectresolver.h index 92924ea..cb93d65 100644 --- a/SQLiteStudio3/coreSQLiteStudio/selectresolver.h +++ b/SQLiteStudio3/coreSQLiteStudio/selectresolver.h @@ -3,7 +3,6 @@ #include "parser/ast/sqliteselect.h" #include "common/bistrhash.h" -#include "dialect.h" #include "expectedtoken.h" #include "parser/ast/sqlitewith.h" #include @@ -41,6 +40,12 @@ class SchemaResolver; * Result column like "table.*" will produce one or more column * objects from this class. * + * In case of CTE (Common Table Expression, aka WITH statement) + * the columns resolved from CTE will by of type COLUMN + * and will have FROM_CTE flag set. Such columns will have + * displayName and tableAlias populated, while database, table + * and column attributes may or may not be populated. + * * There's one unsupported case: When the select has a subselect * in "FROM" clause and that subselect is actually a multi-core * select (with UNIONs), then columns produced from such source @@ -204,6 +209,7 @@ class API_EXPORT SelectResolver QList resolveJoinSource(SqliteSelect::Core::JoinSource* joinSrc); QList resolveSingleSource(SqliteSelect::Core::SingleSource* joinSrc); + QList resolveCteColumns(SqliteSelect::Core::SingleSource* joinSrc); QList resolveTableFunctionColumns(SqliteSelect::Core::SingleSource* joinSrc); QList resolveSingleSourceSubSelect(SqliteSelect::Core::SingleSource* joinSrc); QList resolveOtherSource(SqliteSelect::Core::JoinSourceOther *otherSrc); @@ -217,7 +223,6 @@ class API_EXPORT SelectResolver void markDistinctColumns(); void markCompoundColumns(); - void markCteColumns(QList* columnList = nullptr); void markGroupedColumns(); void fixColumnNames(); void markCurrentColumnsWithFlag(Flag flag, QList* columnList = nullptr); -- cgit v1.2.3