From d7abf57f713a4591adb7d092378ea130777d7c9a Mon Sep 17 00:00:00 2001 From: Vlad Rozov Date: Sat, 22 Nov 2025 16:33:36 -0800 Subject: [PATCH] [SPARK-54412][SQL][TESTS] Clean up `v` properly in `identifier-clause.sql` SQL golden file --- .../analyzer-results/identifier-clause-legacy.sql.out | 6 ++++++ .../sql-tests/analyzer-results/identifier-clause.sql.out | 6 ++++++ .../test/resources/sql-tests/inputs/identifier-clause.sql | 1 + .../sql-tests/results/identifier-clause-legacy.sql.out | 8 ++++++++ .../resources/sql-tests/results/identifier-clause.sql.out | 8 ++++++++ 5 files changed, 29 insertions(+) diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/identifier-clause-legacy.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/identifier-clause-legacy.sql.out index 2d7d551f51ca..e53a8153e829 100644 --- a/sql/core/src/test/resources/sql-tests/analyzer-results/identifier-clause-legacy.sql.out +++ b/sql/core/src/test/resources/sql-tests/analyzer-results/identifier-clause-legacy.sql.out @@ -1405,6 +1405,12 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException } +-- !query +DROP VIEW IF EXISTS v +-- !query analysis +DropTableCommand `spark_catalog`.`default`.`v`, true, true, false + + -- !query CREATE TABLE tab(IDENTIFIER('c1') INT) USING CSV -- !query analysis diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/identifier-clause.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/identifier-clause.sql.out index 9adecd5e5373..abc6cc625b6a 100644 --- a/sql/core/src/test/resources/sql-tests/analyzer-results/identifier-clause.sql.out +++ b/sql/core/src/test/resources/sql-tests/analyzer-results/identifier-clause.sql.out @@ -1379,6 +1379,12 @@ Project [c1#x] +- LocalRelation [col1#x] +-- !query +DROP VIEW IF EXISTS v +-- !query analysis +DropTableCommand `spark_catalog`.`default`.`v`, true, true, false + + -- !query CREATE TABLE tab(IDENTIFIER('c1') INT) USING CSV -- !query analysis diff --git a/sql/core/src/test/resources/sql-tests/inputs/identifier-clause.sql b/sql/core/src/test/resources/sql-tests/inputs/identifier-clause.sql index 10d14eebc1d4..bb6c7107062d 100644 --- a/sql/core/src/test/resources/sql-tests/inputs/identifier-clause.sql +++ b/sql/core/src/test/resources/sql-tests/inputs/identifier-clause.sql @@ -180,6 +180,7 @@ SELECT my_table.* FROM VALUES (1, 2) AS IDENTIFIER('my_table')(IDENTIFIER('c1'), WITH identifier('v')(identifier('c1')) AS (VALUES(1)) (SELECT c1 FROM v); CREATE OR REPLACE VIEW v(IDENTIFIER('c1')) AS VALUES(1); SELECT c1 FROM v; +DROP VIEW IF EXISTS v; CREATE TABLE tab(IDENTIFIER('c1') INT) USING CSV; INSERT INTO tab(IDENTIFIER('c1')) VALUES(1); SELECT c1 FROM tab; diff --git a/sql/core/src/test/resources/sql-tests/results/identifier-clause-legacy.sql.out b/sql/core/src/test/resources/sql-tests/results/identifier-clause-legacy.sql.out index 79f0f8e77c76..272d9bce8165 100644 --- a/sql/core/src/test/resources/sql-tests/results/identifier-clause-legacy.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/identifier-clause-legacy.sql.out @@ -1557,6 +1557,14 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException } +-- !query +DROP VIEW IF EXISTS v +-- !query schema +struct<> +-- !query output + + + -- !query CREATE TABLE tab(IDENTIFIER('c1') INT) USING CSV -- !query schema diff --git a/sql/core/src/test/resources/sql-tests/results/identifier-clause.sql.out b/sql/core/src/test/resources/sql-tests/results/identifier-clause.sql.out index 2e2efa2fdc27..b398c07b14e1 100644 --- a/sql/core/src/test/resources/sql-tests/results/identifier-clause.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/identifier-clause.sql.out @@ -1496,6 +1496,14 @@ struct 1 +-- !query +DROP VIEW IF EXISTS v +-- !query schema +struct<> +-- !query output + + + -- !query CREATE TABLE tab(IDENTIFIER('c1') INT) USING CSV -- !query schema