Allow usage of column alias in WHERE expression

wsporto · Nov 27, 2024 · 02a2f09 · 02a2f09
1 parent ea21578
commit 02a2f09
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 13 deletions.
diff --git a/src/sqlite-query-analyzer/traverse.ts b/src/sqlite-query-analyzer/traverse.ts
@@ -292,32 +292,32 @@ function traverse_select_core(
 		}
 	});
 
+	const newColumns = listType.map((selectField) => {
+		const col: ColumnDef = {
+			columnName: selectField.name,
+			table: selectField.table,
+			columnType: selectField.type,
+			notNull: selectField.notNull,
+			columnKey: '',
+			hidden: selectField.hidden || 0
+		};
+		return col;
+	});
 	const whereExpr = select_core._whereExpr;
 	if (whereExpr) {
 		traverse_expr(whereExpr, {
 			...traverseContext,
-			fromColumns: fromColumns
+			fromColumns: fromColumns.concat(newColumns)
 		});
 		if (!traverseContext.subQuery) {
-			const { relations, params } = extractRelationsAndParams(whereExpr, fromColumns, traverseContext.parameters);
+			const { relations, params } = extractRelationsAndParams(whereExpr, fromColumns.concat(newColumns), traverseContext.parameters);
 			traverseContext.dynamicSqlInfo2.where.push({
 				fragment: `AND ${extractOriginalSql(whereExpr)}`,
 				dependOnRelations: [...new Set(relations)], //remove duplicated
 				parameters: params
 			});
 		}
 	}
-	const newColumns = listType.map((selectField) => {
-		const col: ColumnDef = {
-			columnName: selectField.name,
-			table: selectField.table,
-			columnType: selectField.type,
-			notNull: selectField.notNull,
-			columnKey: '',
-			hidden: selectField.hidden || 0
-		};
-		return col;
-	});
 	const groupByExprList = select_core._groupByExpr || [];
 	groupByExprList.forEach((groupByExpr) => {
 		traverse_expr(groupByExpr, {

diff --git a/tests/sqlite/sqlite-parse-select-single-table.test.ts b/tests/sqlite/sqlite-parse-select-single-table.test.ts
@@ -1890,4 +1890,29 @@ describe('sqlite-Test simple select statements', () => {
 		}
 		assert.deepStrictEqual(actual.right, expected);
 	});
+
+	it('SELECT 1 + 1 as col_alias WHERE col_alias > 0', async () => {
+		const sql = 'SELECT 1 + 1 as col_alias WHERE col_alias > 0';
+
+		const actual = await parseSql(sql, sqliteDbSchema);
+		const expected: SchemaDef = {
+			sql,
+			queryType: 'Select',
+			multipleRowsResult: false,
+			columns: [
+				{
+					columnName: 'col_alias',
+					type: 'INTEGER',
+					notNull: true,
+					table: ''
+				}
+			],
+			parameters: []
+		};
+
+		if (isLeft(actual)) {
+			assert.fail(`Shouldn't return an error: ${actual.left.description}`);
+		}
+		assert.deepStrictEqual(actual.right, expected);
+	});
 });