From 667909704dd5c172fd71728898394c57cc8ebb8d Mon Sep 17 00:00:00 2001 From: panbingkun Date: Fri, 2 Jun 2023 09:00:08 +0800 Subject: [PATCH 1/3] [MINOR][TESTS] fix bug for natural-join --- .../resources/sql-tests/analyzer-results/natural-join.sql.out | 2 +- .../src/test/resources/sql-tests/results/natural-join.sql.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/natural-join.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/natural-join.sql.out index 987fb3e0a09c8..8fe2ba77855ba 100644 --- a/sql/core/src/test/resources/sql-tests/analyzer-results/natural-join.sql.out +++ b/sql/core/src/test/resources/sql-tests/analyzer-results/natural-join.sql.out @@ -494,7 +494,7 @@ org.apache.spark.sql.AnalysisException "sqlState" : "42703", "messageParameters" : { "objectName" : "`nt2`.`k`", - "proposal" : "`k`, `v1`, `v2`" + "proposal" : "`__auto_generated_subquery_name`.`k`, `__auto_generated_subquery_name`.`v1`, `__auto_generated_subquery_name`.`v2`" }, "queryContext" : [ { "objectType" : "", diff --git a/sql/core/src/test/resources/sql-tests/results/natural-join.sql.out b/sql/core/src/test/resources/sql-tests/results/natural-join.sql.out index a8c7ef556fbb7..7faa7822c5fda 100644 --- a/sql/core/src/test/resources/sql-tests/results/natural-join.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/natural-join.sql.out @@ -254,7 +254,7 @@ org.apache.spark.sql.AnalysisException "sqlState" : "42703", "messageParameters" : { "objectName" : "`nt2`.`k`", - "proposal" : "`k`, `v1`, `v2`" + "proposal" : "`__auto_generated_subquery_name`.`k`, `__auto_generated_subquery_name`.`v1`, `__auto_generated_subquery_name`.`v2`" }, "queryContext" : [ { "objectType" : "", From 491c4ae5e5dc8ea9b717cc95c6efebebf01c4c14 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Fri, 2 Jun 2023 10:19:46 +0800 Subject: [PATCH 2/3] Revert "[MINOR][TESTS] fix bug for natural-join" This reverts commit 667909704dd5c172fd71728898394c57cc8ebb8d. --- .../resources/sql-tests/analyzer-results/natural-join.sql.out | 2 +- .../src/test/resources/sql-tests/results/natural-join.sql.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/natural-join.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/natural-join.sql.out index 8fe2ba77855ba..987fb3e0a09c8 100644 --- a/sql/core/src/test/resources/sql-tests/analyzer-results/natural-join.sql.out +++ b/sql/core/src/test/resources/sql-tests/analyzer-results/natural-join.sql.out @@ -494,7 +494,7 @@ org.apache.spark.sql.AnalysisException "sqlState" : "42703", "messageParameters" : { "objectName" : "`nt2`.`k`", - "proposal" : "`__auto_generated_subquery_name`.`k`, `__auto_generated_subquery_name`.`v1`, `__auto_generated_subquery_name`.`v2`" + "proposal" : "`k`, `v1`, `v2`" }, "queryContext" : [ { "objectType" : "", diff --git a/sql/core/src/test/resources/sql-tests/results/natural-join.sql.out b/sql/core/src/test/resources/sql-tests/results/natural-join.sql.out index 7faa7822c5fda..a8c7ef556fbb7 100644 --- a/sql/core/src/test/resources/sql-tests/results/natural-join.sql.out +++ b/sql/core/src/test/resources/sql-tests/results/natural-join.sql.out @@ -254,7 +254,7 @@ org.apache.spark.sql.AnalysisException "sqlState" : "42703", "messageParameters" : { "objectName" : "`nt2`.`k`", - "proposal" : "`__auto_generated_subquery_name`.`k`, `__auto_generated_subquery_name`.`v1`, `__auto_generated_subquery_name`.`v2`" + "proposal" : "`k`, `v1`, `v2`" }, "queryContext" : [ { "objectType" : "", From 86a5430837c10f5311568255789f9187e381551d Mon Sep 17 00:00:00 2001 From: panbingkun Date: Fri, 2 Jun 2023 10:20:55 +0800 Subject: [PATCH 3/3] [MINOR][TESTS] fix bug for toSQLId --- .../scala/org/apache/spark/sql/errors/QueryErrorsBase.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryErrorsBase.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryErrorsBase.scala index 885b2f775e00c..77f714a0f90eb 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryErrorsBase.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryErrorsBase.scala @@ -72,7 +72,7 @@ private[sql] trait QueryErrorsBase { def toSQLId(parts: Seq[String]): String = { val cleaned = parts match { - case "__auto_generated_subquery_name" :: rest if rest != Nil => rest + case Seq("__auto_generated_subquery_name", rest @ _*) if rest != Nil => rest case other => other } cleaned.map(quoteIdentifier).mkString(".")