fix table_name

Author: lmangani

src/parse_where.cpp

@@ -18,6 +18,7 @@
 #include "duckdb/parser/expression/lambda_expression.hpp"
 #include "duckdb/parser/expression/positional_reference_expression.hpp"
 #include "duckdb/parser/expression/parameter_expression.hpp"
+#include "duckdb/parser/tableref/basetableref.hpp"
 #include "duckdb/main/extension_util.hpp"
 
 namespace duckdb {
@@ -132,21 +133,24 @@ static void ExtractWhereConditionsFromQueryNode(
 ) {
     if (node.type == QueryNodeType::SELECT_NODE) {
         auto &select_node = (SelectNode &)node;
+        string table_name = "(empty)";  // Default table name
+
+        // Extract table name from FROM clause
+        if (select_node.from_table) {
+            if (select_node.from_table->type == TableReferenceType::BASE_TABLE) {
+                auto &base = (BaseTableRef &)*select_node.from_table;
+                table_name = base.table_name;
+            }
+        }
 
         // Extract WHERE conditions
         if (select_node.where_clause) {
-            ExtractWhereConditionsFromExpression(*select_node.where_clause, results, "WHERE");
+            ExtractWhereConditionsFromExpression(*select_node.where_clause, results, "WHERE", table_name);
         }
 
         // Extract HAVING conditions
         if (select_node.having) {
-            ExtractWhereConditionsFromExpression(*select_node.having, results, "HAVING");
-        }
-
-        // Process subqueries in FROM clause
-        if (select_node.from_table) {
-            // TODO: Extract table names from FROM clause to associate with conditions
-            // This would require tracking table aliases and their relationships
+            ExtractWhereConditionsFromExpression(*select_node.having, results, "HAVING", table_name);
         }
     }
 }

test/sql/parse_tools/table_functions/parse_where.test

@@ -15,72 +15,72 @@ require parser_tools
 query III
 SELECT * FROM parse_where('SELECT * FROM my_table WHERE x > 1;');
 ----
-(x > 1)	(empty)	WHERE
+(x > 1)	my_table	WHERE
 
 # Simple comparison with detailed parser
 query IIIII
 SELECT * FROM parse_where_detailed('SELECT * FROM my_table WHERE x > 1;');
 ----
-x	>	1	(empty)	WHERE
+x	>	1	my_table	WHERE
 
 # Multiple conditions with AND
 query III
 SELECT * FROM parse_where('SELECT * FROM my_table WHERE x > 1 AND y < 100;');
 ----
-(x > 1)	(empty)	WHERE
-(y < 100)	(empty)	WHERE
+(x > 1)	my_table	WHERE
+(y < 100)	my_table	WHERE
 
 # Multiple conditions with AND (detailed)
 query IIIII
 SELECT * FROM parse_where_detailed('SELECT * FROM my_table WHERE x > 1 AND y < 100;');
 ----
-x	>	1	(empty)	WHERE
-y	<	100	(empty)	WHERE
+x	>	1	my_table	WHERE
+y	<	100	my_table	WHERE
 
 # BETWEEN condition
 query III
 SELECT * FROM parse_where('SELECT * FROM my_table WHERE x BETWEEN 1 AND 100;');
 ----
-(x BETWEEN 1 AND 100)	(empty)	WHERE
+(x BETWEEN 1 AND 100)	my_table	WHERE
 
 # BETWEEN condition (detailed)
 query IIIII
 SELECT * FROM parse_where_detailed('SELECT * FROM my_table WHERE x BETWEEN 1 AND 100;');
 ----
-x	>=	1	(empty)	WHERE
-x	<=	100	(empty)	WHERE
+x	>=	1	my_table	WHERE
+x	<=	100	my_table	WHERE
 
 # Complex conditions with AND/OR
 query III
 SELECT * FROM parse_where('SELECT * FROM my_table WHERE (x > 1 AND y < 100) OR z = 42;');
 ----
-(x > 1)	(empty)	WHERE
-(y < 100)	(empty)	WHERE
-(z = 42)	(empty)	WHERE
+(x > 1)	my_table	WHERE
+(y < 100)	my_table	WHERE
+(z = 42)	my_table	WHERE
 
 # Complex conditions with AND/OR (detailed)
 query IIIII
 SELECT * FROM parse_where_detailed('SELECT * FROM my_table WHERE (x > 1 AND y < 100) OR z = 42;');
 ----
-x	>	1	(empty)	WHERE
-y	<	100	(empty)	WHERE
-z	=	42	(empty)	WHERE
+x	>	1	my_table	WHERE
+y	<	100	my_table	WHERE
+z	=	42	my_table	WHERE
 
 # Multiple operators
 query III
 SELECT * FROM parse_where('SELECT * FROM my_table WHERE x >= 1 AND x <= 100 AND y != 42;');
 ----
-(x >= 1)	(empty)	WHERE
-(x <= 100)	(empty)	WHERE
-(y != 42)	(empty)	WHERE
+(x >= 1)	my_table	WHERE
+(x <= 100)	my_table	WHERE
+(y != 42)	my_table	WHERE
 
 # Multiple operators (detailed)
 query IIIII
 SELECT * FROM parse_where_detailed('SELECT * FROM my_table WHERE x >= 1 AND x <= 100 AND y != 42;');
 ----
-x	>=	1	(empty)	WHERE
-x	<=	100	(empty)	WHERE
-y	!=	42	(empty)	WHERE
+x	>=	1	my_table	WHERE
+x	<=	100	my_table	WHERE
+y	!=	42	my_table	WHERE
 
 # No WHERE clause
 query III