You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2025/05/19 08:08:43 UTC

(spark) branch master updated: [SPARK-52189][SQL] New golden file tests for NATURAL JOIN with GROUP BY, HAVING, ORDER BY and LCAs

This is an automated email from the ASF dual-hosted git repository.

maxgekk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 6a75387ecb11 [SPARK-52189][SQL] New golden file tests for NATURAL JOIN with GROUP BY, HAVING, ORDER BY and LCAs
6a75387ecb11 is described below

commit 6a75387ecb11c06e5bec9b374246b3941409d1ac
Author: Vladimir Golubev <vl...@databricks.com>
AuthorDate: Mon May 19 10:08:24 2025 +0200

    [SPARK-52189][SQL] New golden file tests for NATURAL JOIN with GROUP BY, HAVING, ORDER BY and LCAs
    
    ### What changes were proposed in this pull request?
    
    Add new golden file tests for NATURAL JOIN with GROUP BY, HAVING, ORDER BY and LCAs
    
    ### Why are the changes needed?
    
    To cover Spark test gaps discovered during single-pass Analyzer implementation.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    New tests.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    No.
    
    Closes #50920 from vladimirg-db/vladimir-golubev_data/add-new-order-by-and-having-golden-file-tests.
    
    Authored-by: Vladimir Golubev <vl...@databricks.com>
    Signed-off-by: Max Gekk <ma...@gmail.com>
---
 ...nd-having-on-top-of-aggregate-with-join.sql.out | 3151 ++++++++++++++++++++
 .../sql-tests/analyzer-results/order-by.sql.out    |   86 -
 ...by-and-having-on-top-of-aggregate-with-join.sql |  244 ++
 .../test/resources/sql-tests/inputs/order-by.sql   |   29 -
 ...nd-having-on-top-of-aggregate-with-join.sql.out | 2513 ++++++++++++++++
 .../resources/sql-tests/results/order-by.sql.out   |   66 -
 6 files changed, 5908 insertions(+), 181 deletions(-)

diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/order-by-and-having-on-top-of-aggregate-with-join.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/order-by-and-having-on-top-of-aggregate-with-join.sql.out
new file mode 100644
index 000000000000..002363b91412
--- /dev/null
+++ b/sql/core/src/test/resources/sql-tests/analyzer-results/order-by-and-having-on-top-of-aggregate-with-join.sql.out
@@ -0,0 +1,3151 @@
+-- Automatically generated by SQLQueryTestSuite
+-- !query
+CREATE OR REPLACE TEMPORARY VIEW v1 AS SELECT * FROM VALUES
+  (1, 2),
+  (3, 5),
+  (7, 2),
+  (1, 2),
+  (8, 3),
+  (4, 9),
+  (5, 7),
+  (9, 4),
+  (2, 6),
+  (5, 7),
+  (3, 8),
+  (6, 1),
+  (4, 9),
+  (7, 5),
+  (2, 8)
+-- !query analysis
+CreateViewCommand `v1`, SELECT * FROM VALUES
+  (1, 2),
+  (3, 5),
+  (7, 2),
+  (1, 2),
+  (8, 3),
+  (4, 9),
+  (5, 7),
+  (9, 4),
+  (2, 6),
+  (5, 7),
+  (3, 8),
+  (6, 1),
+  (4, 9),
+  (7, 5),
+  (2, 8), false, true, LocalTempView, UNSUPPORTED, true
+   +- Project [col1#x, col2#x]
+      +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+CREATE OR REPLACE TEMPORARY VIEW v2 AS SELECT * FROM VALUES
+  (1, 2),
+  (5, 9),
+  (8, 4),
+  (7, 5),
+  (4, 9),
+  (3, 1),
+  (7, 2),
+  (6, 8),
+  (9, 7),
+  (2, 3),
+  (8, 3),
+  (5, 7),
+  (1, 6),
+  (3, 2),
+  (9, 8)
+-- !query analysis
+CreateViewCommand `v2`, SELECT * FROM VALUES
+  (1, 2),
+  (5, 9),
+  (8, 4),
+  (7, 5),
+  (4, 9),
+  (3, 1),
+  (7, 2),
+  (6, 8),
+  (9, 7),
+  (2, 3),
+  (8, 3),
+  (5, 7),
+  (1, 6),
+  (3, 2),
+  (9, 8), false, true, LocalTempView, UNSUPPORTED, true
+   +- Project [col1#x, col2#x]
+      +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col1
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [col1#x ASC NULLS FIRST], true
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 65,
+    "stopIndex" : 68,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col1
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [col1#x ASC NULLS FIRST], true
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 68,
+    "stopIndex" : 74,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 68,
+    "stopIndex" : 74,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 68,
+    "stopIndex" : 74,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col1, 2 + col2
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [(1 + col1)#x ASC NULLS FIRST, (2 + col2)#x ASC NULLS FIRST], true
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x, (2 + col2#x) AS (2 + col2)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col2, 2 + col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 83,
+    "stopIndex" : 86,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col1, 2 + v1.col2
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [(1 + col1)#x ASC NULLS FIRST, (2 + col2)#x ASC NULLS FIRST], true
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x, (2 + col2#x) AS (2 + col2)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col2, 2 + v1.col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 89,
+    "stopIndex" : 95,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v1.col1, 2 + v2.col2
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [(1 + col1)#x ASC NULLS FIRST, (2 + col2)#x ASC NULLS FIRST], true
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x, (2 + col2#x) AS (2 + col2)#x]
+      +- Project [col1#x, col2#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v2.col1, 2 + v1.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 89,
+    "stopIndex" : 95,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col1)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [max(col1)#x ASC NULLS FIRST], true
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col2)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [max(col2)#x ASC NULLS FIRST], true
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col1)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [max(col1)#x ASC NULLS FIRST], true
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col2)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [max(col2)#x ASC NULLS FIRST], true
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col1)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [max(col1)#x ASC NULLS FIRST], true
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+      +- Project [col1#x, col2#x, col1#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col2)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [max(col2)#x ASC NULLS FIRST], true
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+      +- Project [col1#x, col2#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col1), 2 + MIN(col2)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [(1 + max(col1)#x) ASC NULLS FIRST, (2 + min(col2)#x) ASC NULLS FIRST], true
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x, min(col2#x) AS min(col2)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col2), 2 + MIN(col1)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [(1 + max(col2)#x) ASC NULLS FIRST, (2 + min(col1)#x) ASC NULLS FIRST], true
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x, min(col1#x) AS min(col1)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [(1 + max(col1)#x) ASC NULLS FIRST, (2 + min(col2)#x) ASC NULLS FIRST], true
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x, min(col2#x) AS min(col2)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [(1 + max(col2)#x) ASC NULLS FIRST, (2 + min(col1)#x) ASC NULLS FIRST], true
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x, min(col1#x) AS min(col1)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [(1 + max(col1)#x) ASC NULLS FIRST, (2 + min(col2)#x) ASC NULLS FIRST], true
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x, min(col2#x) AS min(col2)#x]
+      +- Project [col1#x, col2#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v2.col1), 2 + MIN(v1.col2)
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [(1 + max(col1)#x) ASC NULLS FIRST, (2 + min(col2)#x) ASC NULLS FIRST], true
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x, min(col2#x) AS min(col2)#x]
+      +- Project [col1#x, col2#x, col2#x, col1#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col1
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [col1#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, col1#x]
+      +- Project [sum(col2)#xL, col1#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, col1#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 94,
+    "stopIndex" : 97,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col1
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [col1#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, col1#x]
+      +- Project [sum(col2)#xL, col1#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, col1#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 97,
+    "stopIndex" : 103,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 97,
+    "stopIndex" : 103,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 97,
+    "stopIndex" : 103,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col1, 2 + col2
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [(1 + col1)#x ASC NULLS FIRST, (2 + col2)#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, (1 + col1)#x AS (1 + col1)#x, (2 + col2)#x AS (2 + col2)#x]
+      +- Project [sum(col2)#xL, (1 + col1)#x, (2 + col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, (1 + col1)#x, (2 + col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x, (2 + col2#x) AS (2 + col2)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col2, 2 + col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 115,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col1, 2 + v1.col2
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [(1 + col1)#x ASC NULLS FIRST, (2 + col2)#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, (1 + col1)#x AS (1 + col1)#x, (2 + col2)#x AS (2 + col2)#x]
+      +- Project [sum(col2)#xL, (1 + col1)#x, (2 + col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, (1 + col1)#x, (2 + col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x, (2 + col2#x) AS (2 + col2)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col2, 2 + v1.col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 118,
+    "stopIndex" : 124,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v1.col1, 2 + v2.col2
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [(1 + col1)#x ASC NULLS FIRST, (2 + col2)#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, (1 + col1)#x AS (1 + col1)#x, (2 + col2)#x AS (2 + col2)#x]
+      +- Project [sum(col2)#xL, (1 + col1)#x, (2 + col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, (1 + col1)#x, (2 + col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x, (2 + col2#x) AS (2 + col2)#x]
+               +- Project [col1#x, col2#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v2.col1, 2 + v1.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 118,
+    "stopIndex" : 124,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col1)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [max(col1)#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col2)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [max(col2)#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col2)#x AS max(col2)#x]
+      +- Project [sum(col2)#xL, max(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col1)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [max(col1)#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col2)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [max(col2)#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col2)#x AS max(col2)#x]
+      +- Project [sum(col2)#xL, max(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col1)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [max(col1)#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+               +- Project [col1#x, col2#x, col1#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col2)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [max(col2)#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col2)#x AS max(col2)#x]
+      +- Project [sum(col2)#xL, max(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+               +- Project [col1#x, col2#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col1), 2 + MIN(col2)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [(1 + max(col1)#x) ASC NULLS FIRST, (2 + min(col2)#x) ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x, min(col2)#x AS min(col2)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, min(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, min(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x, min(col2#x) AS min(col2)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col2), 2 + MIN(col1)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [(1 + max(col2)#x) ASC NULLS FIRST, (2 + min(col1)#x) ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col2)#x AS max(col2)#x, min(col1)#x AS min(col1)#x]
+      +- Project [sum(col2)#xL, max(col2)#x, min(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col2)#x, min(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x, min(col1#x) AS min(col1)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [(1 + max(col1)#x) ASC NULLS FIRST, (2 + min(col2)#x) ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x, min(col2)#x AS min(col2)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, min(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, min(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x, min(col2#x) AS min(col2)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [(1 + max(col2)#x) ASC NULLS FIRST, (2 + min(col1)#x) ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col2)#x AS max(col2)#x, min(col1)#x AS min(col1)#x]
+      +- Project [sum(col2)#xL, max(col2)#x, min(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col2)#x, min(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x, min(col1#x) AS min(col1)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [(1 + max(col1)#x) ASC NULLS FIRST, (2 + min(col2)#x) ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x, min(col2)#x AS min(col2)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, min(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, min(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x, min(col2#x) AS min(col2)#x]
+               +- Project [col1#x, col2#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v2.col1), 2 + MIN(v1.col2)
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [(1 + max(col1)#x) ASC NULLS FIRST, (2 + min(col2)#x) ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x, min(col2)#x AS min(col2)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, min(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, min(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x, min(col2#x) AS min(col2)#x]
+               +- Project [col1#x, col2#x, col2#x, col1#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter (col1#x > 5)
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 63,
+    "stopIndex" : 66,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter (col1#x > 5)
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter ((1 + col1)#x > 5)
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 81,
+    "stopIndex" : 84,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter ((1 + col1)#x > 5)
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 87,
+    "stopIndex" : 93,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter ((1 + col1)#x > 5)
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x]
+      +- Project [col1#x, col2#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 87,
+    "stopIndex" : 93,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter (max(col1)#x > 5)
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter (max(col2)#x > 5)
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter (max(col1)#x > 5)
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter (max(col2)#x > 5)
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter (max(col1)#x > 5)
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+      +- Project [col1#x, col2#x, col1#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter (max(col2)#x > 5)
+   +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+      +- Project [col1#x, col2#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter ((1 + max(col1)#x) > 5)
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter ((1 + max(col2)#x) > 5)
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter ((1 + max(col1)#x) > 5)
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter ((1 + max(col2)#x) > 5)
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+      +- Project [col1#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter ((1 + max(col1)#x) > 5)
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+      +- Project [col1#x, col2#x, col2#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v2.col1) > 5
+-- !query analysis
+Project [sum(col2)#xL]
++- Filter ((1 + max(col1)#x) > 5)
+   +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+      +- Project [col1#x, col2#x, col2#x, col1#x]
+         +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+            :- SubqueryAlias v1
+            :  +- View (`v1`, [col1#x, col2#x])
+            :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+            :        +- Project [col1#x, col2#x]
+            :           +- LocalRelation [col1#x, col2#x]
+            +- SubqueryAlias v2
+               +- View (`v2`, [col1#x, col2#x])
+                  +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     +- Project [col1#x, col2#x]
+                        +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter (col1#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, col1#x]
+      +- Project [sum(col2)#xL, col1#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, col1#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 92,
+    "stopIndex" : 95,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter (col1#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, col1#x]
+      +- Project [sum(col2)#xL, col1#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, col1#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter ((1 + col1)#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, (1 + col1)#x AS (1 + col1)#x]
+      +- Project [sum(col2)#xL, (1 + col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, (1 + col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 110,
+    "stopIndex" : 113,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter ((1 + col1)#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, (1 + col1)#x AS (1 + col1)#x]
+      +- Project [sum(col2)#xL, (1 + col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, (1 + col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 116,
+    "stopIndex" : 122,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter ((1 + col1)#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, (1 + col1)#x AS (1 + col1)#x]
+      +- Project [sum(col2)#xL, (1 + col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, (1 + col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, (1 + col1#x) AS (1 + col1)#x]
+               +- Project [col1#x, col2#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 116,
+    "stopIndex" : 122,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter (max(col1)#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter (max(col2)#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col2)#x AS max(col2)#x]
+      +- Project [sum(col2)#xL, max(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter (max(col1)#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter (max(col2)#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col2)#x AS max(col2)#x]
+      +- Project [sum(col2)#xL, max(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter (max(col1)#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+               +- Project [col1#x, col2#x, col1#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter (max(col2)#x > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col2)#x AS max(col2)#x]
+      +- Project [sum(col2)#xL, max(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+               +- Project [col1#x, col2#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter ((1 + max(col1)#x) > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter ((1 + max(col2)#x) > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col2)#x AS max(col2)#x]
+      +- Project [sum(col2)#xL, max(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter ((1 + max(col1)#x) > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter ((1 + max(col2)#x) > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col2)#x AS max(col2)#x]
+      +- Project [sum(col2)#xL, max(col2)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col2)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col2#x) AS max(col2)#x]
+               +- Project [col1#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter ((1 + max(col1)#x) > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+               +- Project [col1#x, col2#x, col2#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v2.col1) > 5
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Filter ((1 + max(col1)#x) > 5)
+   +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, max(col1)#x AS max(col1)#x]
+      +- Project [sum(col2)#xL, max(col1)#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+         +- Project [sum(col2)#xL, max(col1)#x, sum(col2)#xL AS a#xL]
+            +- Aggregate [(col1#x + 1), (col2#x + 2)], [sum(col2#x) AS sum(col2)#xL, max(col1#x) AS max(col1)#x]
+               +- Project [col1#x, col2#x, col2#x, col1#x]
+                  +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                     :- SubqueryAlias v1
+                     :  +- View (`v1`, [col1#x, col2#x])
+                     :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                     :        +- Project [col1#x, col2#x]
+                     :           +- LocalRelation [col1#x, col2#x]
+                     +- SubqueryAlias v2
+                        +- View (`v2`, [col1#x, col2#x])
+                           +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                              +- Project [col1#x, col2#x]
+                                 +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5 ORDER BY col1
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [col1#x ASC NULLS FIRST], true
+   +- Project [sum(col2)#xL, col1#x]
+      +- Filter (col1#x > 5)
+         +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+            +- Project [col1#x, col2#x]
+               +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                  :- SubqueryAlias v1
+                  :  +- View (`v1`, [col1#x, col2#x])
+                  :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                  :        +- Project [col1#x, col2#x]
+                  :           +- LocalRelation [col1#x, col2#x]
+                  +- SubqueryAlias v2
+                     +- View (`v2`, [col1#x, col2#x])
+                        +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                           +- Project [col1#x, col2#x]
+                              +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5 ORDER BY col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 63,
+    "stopIndex" : 66,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5 ORDER BY v1.col1
+-- !query analysis
+Project [sum(col2)#xL]
++- Sort [col1#x ASC NULLS FIRST], true
+   +- Project [sum(col2)#xL, col1#x]
+      +- Filter (col1#x > 5)
+         +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+            +- Project [col1#x, col2#x]
+               +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                  :- SubqueryAlias v1
+                  :  +- View (`v1`, [col1#x, col2#x])
+                  :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                  :        +- Project [col1#x, col2#x]
+                  :           +- LocalRelation [col1#x, col2#x]
+                  +- SubqueryAlias v2
+                     +- View (`v2`, [col1#x, col2#x])
+                        +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                           +- Project [col1#x, col2#x]
+                              +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5 ORDER BY v1.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5 ORDER BY v2.col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5 ORDER BY v2.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5 ORDER BY 1 + col1, 2 + col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 103,
+    "stopIndex" : 106,
+    "fragment" : "col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5 ORDER BY 1 + col2, 2 + col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 81,
+    "stopIndex" : 84,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v1.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 118,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5 ORDER BY 1 + v1.col2, 2 + v1.col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 87,
+    "stopIndex" : 93,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v2.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 118,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5 ORDER BY 1 + v2.col1, 2 + v1.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 87,
+    "stopIndex" : 93,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5 ORDER BY MAX(col1)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNSUPPORTED_EXPR_FOR_OPERATOR",
+  "sqlState" : "42K0E",
+  "messageParameters" : {
+    "invalidExprSqls" : "\"max(col1)\""
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 77,
+    "stopIndex" : 94,
+    "fragment" : "ORDER BY MAX(col1)"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5 ORDER BY MAX(col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 90,
+    "stopIndex" : 93,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5 ORDER BY MAX(v1.col1)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNSUPPORTED_EXPR_FOR_OPERATOR",
+  "sqlState" : "42K0E",
+  "messageParameters" : {
+    "invalidExprSqls" : "\"max(col1)\""
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 83,
+    "stopIndex" : 103,
+    "fragment" : "ORDER BY MAX(v1.col1)"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5 ORDER BY MAX(v1.col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 96,
+    "stopIndex" : 102,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5 ORDER BY MAX(v2.col1)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 96,
+    "stopIndex" : 102,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5 ORDER BY MAX(v2.col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 96,
+    "stopIndex" : 102,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5 ORDER BY 1 + MAX(col1), 2 + MIN(col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 115,
+    "fragment" : "col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5 ORDER BY 1 + MAX(col2), 2 + MIN(col1)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 115,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 121,
+    "stopIndex" : 127,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 121,
+    "stopIndex" : 127,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 121,
+    "stopIndex" : 127,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 121,
+    "stopIndex" : 127,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5 ORDER BY col1
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [col1#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, c#xL, col1#x]
+      +- Filter (col1#x > 5)
+         +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, col1#x]
+            +- Project [sum(col2)#xL, col1#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+               +- Project [sum(col2)#xL, col1#x, sum(col2)#xL AS a#xL]
+                  +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+                     +- Project [col1#x, col2#x]
+                        +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                           :- SubqueryAlias v1
+                           :  +- View (`v1`, [col1#x, col2#x])
+                           :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                           :        +- Project [col1#x, col2#x]
+                           :           +- LocalRelation [col1#x, col2#x]
+                           +- SubqueryAlias v2
+                              +- View (`v2`, [col1#x, col2#x])
+                                 +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                                    +- Project [col1#x, col2#x]
+                                       +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5 ORDER BY col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 92,
+    "stopIndex" : 95,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5 ORDER BY v1.col1
+-- !query analysis
+Project [a#xL, b#xL, c#xL]
++- Sort [col1#x ASC NULLS FIRST], true
+   +- Project [a#xL, b#xL, c#xL, col1#x]
+      +- Filter (col1#x > 5)
+         +- Project [a#xL, b#xL, (b#xL + cast(1 as bigint)) AS c#xL, col1#x]
+            +- Project [sum(col2)#xL, col1#x, a#xL, (a#xL + cast(1 as bigint)) AS b#xL]
+               +- Project [sum(col2)#xL, col1#x, sum(col2)#xL AS a#xL]
+                  +- Aggregate [col1#x], [sum(col2#x) AS sum(col2)#xL, col1#x]
+                     +- Project [col1#x, col2#x]
+                        +- Join Inner, ((col1#x = col1#x) AND (col2#x = col2#x))
+                           :- SubqueryAlias v1
+                           :  +- View (`v1`, [col1#x, col2#x])
+                           :     +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                           :        +- Project [col1#x, col2#x]
+                           :           +- LocalRelation [col1#x, col2#x]
+                           +- SubqueryAlias v2
+                              +- View (`v2`, [col1#x, col2#x])
+                                 +- Project [cast(col1#x as int) AS col1#x, cast(col2#x as int) AS col2#x]
+                                    +- Project [col1#x, col2#x]
+                                       +- LocalRelation [col1#x, col2#x]
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5 ORDER BY v1.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5 ORDER BY v2.col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5 ORDER BY v2.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5 ORDER BY 1 + col1, 2 + col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col1`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 132,
+    "stopIndex" : 135,
+    "fragment" : "col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5 ORDER BY 1 + col2, 2 + col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 110,
+    "stopIndex" : 113,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v1.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 141,
+    "stopIndex" : 147,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5 ORDER BY 1 + v1.col2, 2 + v1.col1
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 116,
+    "stopIndex" : 122,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v2.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 141,
+    "stopIndex" : 147,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5 ORDER BY 1 + v2.col1, 2 + v1.col2
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 116,
+    "stopIndex" : 122,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5 ORDER BY MAX(col1)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNSUPPORTED_EXPR_FOR_OPERATOR",
+  "sqlState" : "42K0E",
+  "messageParameters" : {
+    "invalidExprSqls" : "\"max(col1)\""
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 106,
+    "stopIndex" : 123,
+    "fragment" : "ORDER BY MAX(col1)"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5 ORDER BY MAX(col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 119,
+    "stopIndex" : 122,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5 ORDER BY MAX(v1.col1)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNSUPPORTED_EXPR_FOR_OPERATOR",
+  "sqlState" : "42K0E",
+  "messageParameters" : {
+    "invalidExprSqls" : "\"max(col1)\""
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 132,
+    "fragment" : "ORDER BY MAX(v1.col1)"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5 ORDER BY MAX(v1.col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 125,
+    "stopIndex" : 131,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5 ORDER BY MAX(v2.col1)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 125,
+    "stopIndex" : 131,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5 ORDER BY MAX(v2.col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 125,
+    "stopIndex" : 131,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5 ORDER BY 1 + MAX(col1), 2 + MIN(col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col1`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 141,
+    "stopIndex" : 144,
+    "fragment" : "col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5 ORDER BY 1 + MAX(col2), 2 + MIN(col1)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 141,
+    "stopIndex" : 144,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 150,
+    "stopIndex" : 156,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 150,
+    "stopIndex" : 156,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 150,
+    "stopIndex" : 156,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query analysis
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 150,
+    "stopIndex" : 156,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+DROP VIEW IF EXISTS v1
+-- !query analysis
+DropTempViewCommand v1
+
+
+-- !query
+DROP VIEW IF EXISTS v2
+-- !query analysis
+DropTempViewCommand v2
diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/order-by.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/order-by.sql.out
index 903ffdfa62dc..3e6fea111350 100644
--- a/sql/core/src/test/resources/sql-tests/analyzer-results/order-by.sql.out
+++ b/sql/core/src/test/resources/sql-tests/analyzer-results/order-by.sql.out
@@ -12,22 +12,6 @@ AS testData(a, b), false, true, LocalTempView, UNSUPPORTED, true
          +- LocalRelation [a#x, b#x]
 
 
--- !query
-CREATE OR REPLACE TEMPORARY VIEW v1 AS SELECT 1 AS col1
--- !query analysis
-CreateViewCommand `v1`, SELECT 1 AS col1, false, true, LocalTempView, UNSUPPORTED, true
-   +- Project [1 AS col1#x]
-      +- OneRowRelation
-
-
--- !query
-CREATE OR REPLACE TEMPORARY VIEW v2 AS SELECT 1 AS col1
--- !query analysis
-CreateViewCommand `v2`, SELECT 1 AS col1, false, true, LocalTempView, UNSUPPORTED, true
-   +- Project [1 AS col1#x]
-      +- OneRowRelation
-
-
 -- !query
 SELECT a FROM testData ORDER BY a
 -- !query analysis
@@ -214,64 +198,6 @@ Sort [col1#x ASC NULLS FIRST], true
    +- LocalRelation [col1#x]
 
 
--- !query
-SELECT
-  COUNT(DISTINCT col1)
-FROM
-  v1
-NATURAL JOIN
-  v2
-GROUP BY
-  col1
-ORDER BY
-  col1
--- !query analysis
-Project [count(DISTINCT col1)#xL]
-+- Sort [col1#x ASC NULLS FIRST], true
-   +- Aggregate [col1#x], [count(distinct col1#x) AS count(DISTINCT col1)#xL, col1#x]
-      +- Project [col1#x]
-         +- Join Inner, (col1#x = col1#x)
-            :- SubqueryAlias v1
-            :  +- View (`v1`, [col1#x])
-            :     +- Project [cast(col1#x as int) AS col1#x]
-            :        +- Project [1 AS col1#x]
-            :           +- OneRowRelation
-            +- SubqueryAlias v2
-               +- View (`v2`, [col1#x])
-                  +- Project [cast(col1#x as int) AS col1#x]
-                     +- Project [1 AS col1#x]
-                        +- OneRowRelation
-
-
--- !query
-SELECT
-  COUNT(DISTINCT col1)
-FROM
-  v1
-NATURAL JOIN
-  v1
-GROUP BY
-  col1
-ORDER BY
-  col1
--- !query analysis
-Project [count(DISTINCT col1)#xL]
-+- Sort [col1#x ASC NULLS FIRST], true
-   +- Aggregate [col1#x], [count(distinct col1#x) AS count(DISTINCT col1)#xL, col1#x]
-      +- Project [col1#x]
-         +- Join Inner, (col1#x = col1#x)
-            :- SubqueryAlias v1
-            :  +- View (`v1`, [col1#x])
-            :     +- Project [cast(col1#x as int) AS col1#x]
-            :        +- Project [1 AS col1#x]
-            :           +- OneRowRelation
-            +- SubqueryAlias v1
-               +- View (`v1`, [col1#x])
-                  +- Project [cast(col1#x as int) AS col1#x]
-                     +- Project [1 AS col1#x]
-                        +- OneRowRelation
-
-
 -- !query
 SELECT 'a' ORDER BY CAST('a' AS VARIANT)
 -- !query analysis
@@ -452,15 +378,3 @@ org.apache.spark.sql.catalyst.ExtendedAnalysisException
 DROP VIEW IF EXISTS testData
 -- !query analysis
 DropTempViewCommand testData
-
-
--- !query
-DROP VIEW IF EXISTS v1
--- !query analysis
-DropTempViewCommand v1
-
-
--- !query
-DROP VIEW IF EXISTS v2
--- !query analysis
-DropTempViewCommand v2
diff --git a/sql/core/src/test/resources/sql-tests/inputs/order-by-and-having-on-top-of-aggregate-with-join.sql b/sql/core/src/test/resources/sql-tests/inputs/order-by-and-having-on-top-of-aggregate-with-join.sql
new file mode 100644
index 000000000000..4e50f4c4a365
--- /dev/null
+++ b/sql/core/src/test/resources/sql-tests/inputs/order-by-and-having-on-top-of-aggregate-with-join.sql
@@ -0,0 +1,244 @@
+CREATE OR REPLACE TEMPORARY VIEW v1 AS SELECT * FROM VALUES
+  (1, 2),
+  (3, 5),
+  (7, 2),
+  (1, 2),
+  (8, 3),
+  (4, 9),
+  (5, 7),
+  (9, 4),
+  (2, 6),
+  (5, 7),
+  (3, 8),
+  (6, 1),
+  (4, 9),
+  (7, 5),
+  (2, 8)
+;
+CREATE OR REPLACE TEMPORARY VIEW v2 AS SELECT * FROM VALUES
+  (1, 2),
+  (5, 9),
+  (8, 4),
+  (7, 5),
+  (4, 9),
+  (3, 1),
+  (7, 2),
+  (6, 8),
+  (9, 7),
+  (2, 3),
+  (8, 3),
+  (5, 7),
+  (1, 6),
+  (3, 2),
+  (9, 8)
+;
+
+-- ORDER BY
+
+-- Referencing a grouping attribute
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col1;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col2;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col1;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col2;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col1;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col2;
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col1, 2 + col2;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col2, 2 + col1;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col1, 2 + v1.col2;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col2, 2 + v1.col1;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v1.col1, 2 + v2.col2;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v2.col1, 2 + v1.col2;
+
+-- Referencing any attribute under aggregate expression
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col1);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col2);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col1);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col2);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col1);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col2);
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col1), 2 + MIN(col2);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col2), 2 + MIN(col1);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v2.col1), 2 + MIN(v1.col2);
+
+-- ORDER BY with LCA below
+
+-- Referencing a grouping attribute
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col1;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col2;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col1;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col2;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col1;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col2;
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col1, 2 + col2;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col2, 2 + col1;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col1, 2 + v1.col2;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col2, 2 + v1.col1;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v1.col1, 2 + v2.col2;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v2.col1, 2 + v1.col2;
+
+-- Referencing any attribute under aggregate expression
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col1);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col2);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col1);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col2);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col1);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col2);
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col1), 2 + MIN(col2);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col2), 2 + MIN(col1);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v2.col1), 2 + MIN(v1.col2);
+
+-- HAVING
+
+-- Referencing a grouping attribute
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5;
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5;
+
+-- Referencing any attribute under aggregate expression
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5;
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v2.col1) > 5;
+
+-- HAVING with LCA below
+
+-- Referencing a grouping attribute
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5;
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5;
+
+-- Referencing any attribute under aggregate expression
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5;
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v2.col1) > 5;
+
+-- ORDER BY and HAVING
+
+-- Referencing a grouping attribute
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5 ORDER BY col1;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5 ORDER BY col2;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5 ORDER BY v1.col1;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5 ORDER BY v1.col2;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5 ORDER BY v2.col1;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5 ORDER BY v2.col2;
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5 ORDER BY 1 + col1, 2 + col2;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5 ORDER BY 1 + col2, 2 + col1;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v1.col2;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5 ORDER BY 1 + v1.col2, 2 + v1.col1;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v2.col2;
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5 ORDER BY 1 + v2.col1, 2 + v1.col2;
+
+-- Referencing any attribute under aggregate expression.
+-- These mostly fail because Spark does not support referencing any attributes under aggregate expressions in ORDER BY on top of HAVING
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5 ORDER BY MAX(col1);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5 ORDER BY MAX(col2);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5 ORDER BY MAX(v1.col1);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5 ORDER BY MAX(v1.col2);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5 ORDER BY MAX(v2.col1);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5 ORDER BY MAX(v2.col2);
+
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5 ORDER BY 1 + MAX(col1), 2 + MIN(col2);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5 ORDER BY 1 + MAX(col2), 2 + MIN(col1);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2);
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2);
+
+-- ORDER BY and HAVING with LCA below
+
+-- Referencing a grouping attribute
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5 ORDER BY col1;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5 ORDER BY col2;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5 ORDER BY v1.col1;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5 ORDER BY v1.col2;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5 ORDER BY v2.col1;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5 ORDER BY v2.col2;
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5 ORDER BY 1 + col1, 2 + col2;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5 ORDER BY 1 + col2, 2 + col1;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v1.col2;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5 ORDER BY 1 + v1.col2, 2 + v1.col1;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v2.col2;
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5 ORDER BY 1 + v2.col1, 2 + v1.col2;
+
+-- Referencing any attribute under aggregate expression.
+-- These mostly fail because Spark does not support referencing any attributes under aggregate expressions in ORDER BY on top of HAVING
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5 ORDER BY MAX(col1);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5 ORDER BY MAX(col2);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5 ORDER BY MAX(v1.col1);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5 ORDER BY MAX(v1.col2);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5 ORDER BY MAX(v2.col1);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5 ORDER BY MAX(v2.col2);
+
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5 ORDER BY 1 + MAX(col1), 2 + MIN(col2);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5 ORDER BY 1 + MAX(col2), 2 + MIN(col1);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2);
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2);
+
+-- Clean up
+DROP VIEW IF EXISTS v1;
+DROP VIEW IF EXISTS v2;
diff --git a/sql/core/src/test/resources/sql-tests/inputs/order-by.sql b/sql/core/src/test/resources/sql-tests/inputs/order-by.sql
index 04d3fda84c7e..66390038bb30 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/order-by.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/order-by.sql
@@ -2,8 +2,6 @@
 CREATE OR REPLACE TEMPORARY VIEW testData AS SELECT * FROM VALUES
 (1, 1), (1, 2), (2, 1), (2, 2), (3, 1), (3, 2), (null, 1), (3, null), (null, null)
 AS testData(a, b);
-CREATE OR REPLACE TEMPORARY VIEW v1 AS SELECT 1 AS col1;
-CREATE OR REPLACE TEMPORARY VIEW v2 AS SELECT 1 AS col1;
 
 -- ORDER BY a column from a child's output
 SELECT a FROM testData ORDER BY a;
@@ -38,31 +36,6 @@ SELECT col1 FROM VALUES (1, 2) GROUP BY col1 ORDER BY MAX(col2), RAND();
 -- Order by table column and alias with the same name
 SELECT 1 AS col1, col1 FROM VALUES (10) ORDER BY col1;
 
--- Order by on top of natural join with count(distinct)
-SELECT
-  COUNT(DISTINCT col1)
-FROM
-  v1
-NATURAL JOIN
-  v2
-GROUP BY
-  col1
-ORDER BY
-  col1
-;
-
-SELECT
-  COUNT(DISTINCT col1)
-FROM
-  v1
-NATURAL JOIN
-  v1
-GROUP BY
-  col1
-ORDER BY
-  col1
-;
-
 -- Order by non-orderable expressions should fail
 SELECT 'a' ORDER BY CAST('a' AS VARIANT);
 SELECT a, b FROM testData ORDER BY CAST(a + b AS VARIANT);
@@ -75,5 +48,3 @@ SELECT a FROM testData ORDER BY CAST(ARRAY(CAST(true AS VARIANT)) AS VARIANT);
 
 -- Clean up
 DROP VIEW IF EXISTS testData;
-DROP VIEW IF EXISTS v1;
-DROP VIEW IF EXISTS v2;
diff --git a/sql/core/src/test/resources/sql-tests/results/order-by-and-having-on-top-of-aggregate-with-join.sql.out b/sql/core/src/test/resources/sql-tests/results/order-by-and-having-on-top-of-aggregate-with-join.sql.out
new file mode 100644
index 000000000000..19aee5e8e066
--- /dev/null
+++ b/sql/core/src/test/resources/sql-tests/results/order-by-and-having-on-top-of-aggregate-with-join.sql.out
@@ -0,0 +1,2513 @@
+-- Automatically generated by SQLQueryTestSuite
+-- !query
+CREATE OR REPLACE TEMPORARY VIEW v1 AS SELECT * FROM VALUES
+  (1, 2),
+  (3, 5),
+  (7, 2),
+  (1, 2),
+  (8, 3),
+  (4, 9),
+  (5, 7),
+  (9, 4),
+  (2, 6),
+  (5, 7),
+  (3, 8),
+  (6, 1),
+  (4, 9),
+  (7, 5),
+  (2, 8)
+-- !query schema
+struct<>
+-- !query output
+
+
+
+-- !query
+CREATE OR REPLACE TEMPORARY VIEW v2 AS SELECT * FROM VALUES
+  (1, 2),
+  (5, 9),
+  (8, 4),
+  (7, 5),
+  (4, 9),
+  (3, 1),
+  (7, 2),
+  (6, 8),
+  (9, 7),
+  (2, 3),
+  (8, 3),
+  (5, 7),
+  (1, 6),
+  (3, 2),
+  (9, 8)
+-- !query schema
+struct<>
+-- !query output
+
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col1
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+7
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 65,
+    "stopIndex" : 68,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col1
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+7
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 68,
+    "stopIndex" : 74,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 68,
+    "stopIndex" : 74,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 68,
+    "stopIndex" : 74,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col1, 2 + col2
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+2
+5
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col2, 2 + col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 83,
+    "stopIndex" : 86,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col1, 2 + v1.col2
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+2
+5
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col2, 2 + v1.col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 89,
+    "stopIndex" : 95,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v1.col1, 2 + v2.col2
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+2
+5
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v2.col1, 2 + v1.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 89,
+    "stopIndex" : 95,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col1)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+7
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col2)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+3
+7
+14
+18
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col1)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+7
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col2)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+3
+7
+14
+18
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col1)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+7
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col2)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+3
+7
+14
+18
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col1), 2 + MIN(col2)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+2
+5
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col2), 2 + MIN(col1)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+2
+3
+5
+14
+18
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+2
+5
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+2
+3
+5
+14
+18
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+2
+5
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v2.col1), 2 + MIN(v1.col2)
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+4
+18
+14
+2
+5
+3
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col1
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+7	8	9
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 94,
+    "stopIndex" : 97,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col1
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+7	8	9
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v1.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 97,
+    "stopIndex" : 103,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 97,
+    "stopIndex" : 103,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY v2.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 97,
+    "stopIndex" : 103,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col1, 2 + col2
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+2	3	4
+5	6	7
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + col2, 2 + col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 115,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col1, 2 + v1.col2
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+2	3	4
+5	6	7
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + v1.col2, 2 + v1.col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 118,
+    "stopIndex" : 124,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v1.col1, 2 + v2.col2
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+2	3	4
+5	6	7
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + v2.col1, 2 + v1.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 118,
+    "stopIndex" : 124,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col1)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+7	8	9
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 ORDER BY MAX(col2)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+3	4	5
+7	8	9
+14	15	16
+18	19	20
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col1)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+7	8	9
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v1.col2)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+3	4	5
+7	8	9
+14	15	16
+18	19	20
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col1)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+7	8	9
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 ORDER BY MAX(v2.col2)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+3	4	5
+7	8	9
+14	15	16
+18	19	20
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col1), 2 + MIN(col2)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+2	3	4
+5	6	7
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 ORDER BY 1 + MAX(col2), 2 + MIN(col1)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+2	3	4
+3	4	5
+5	6	7
+14	15	16
+18	19	20
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+2	3	4
+5	6	7
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+2	3	4
+3	4	5
+5	6	7
+14	15	16
+18	19	20
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+2	3	4
+5	6	7
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 ORDER BY 1 + MAX(v2.col1), 2 + MIN(v1.col2)
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+4	5	6
+18	19	20
+14	15	16
+2	3	4
+5	6	7
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+3
+7
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 63,
+    "stopIndex" : 66,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+3
+7
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+2
+3
+5
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 81,
+    "stopIndex" : 84,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+2
+3
+5
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 87,
+    "stopIndex" : 93,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+2
+3
+5
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 87,
+    "stopIndex" : 93,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+3
+7
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+18
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+3
+7
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+18
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+3
+7
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+18
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+2
+3
+5
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+18
+5
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+2
+3
+5
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+18
+5
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+2
+3
+5
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v2.col1) > 5
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+14
+2
+3
+5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+3	4	5
+7	8	9
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 92,
+    "stopIndex" : 95,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+3	4	5
+7	8	9
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+2	3	4
+3	4	5
+5	6	7
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 110,
+    "stopIndex" : 113,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+2	3	4
+3	4	5
+5	6	7
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 116,
+    "stopIndex" : 122,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+2	3	4
+3	4	5
+5	6	7
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 116,
+    "stopIndex" : 122,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+3	4	5
+7	8	9
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+18	19	20
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+3	4	5
+7	8	9
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+18	19	20
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+3	4	5
+7	8	9
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+18	19	20
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+2	3	4
+3	4	5
+5	6	7
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+18	19	20
+5	6	7
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+2	3	4
+3	4	5
+5	6	7
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+18	19	20
+5	6	7
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+2	3	4
+3	4	5
+5	6	7
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v2.col1) > 5
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+14	15	16
+2	3	4
+3	4	5
+5	6	7
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5 ORDER BY col1
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+7
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5 ORDER BY col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 63,
+    "stopIndex" : 66,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5 ORDER BY v1.col1
+-- !query schema
+struct<sum(col2):bigint>
+-- !query output
+7
+3
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5 ORDER BY v1.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5 ORDER BY v2.col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5 ORDER BY v2.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 66,
+    "stopIndex" : 72,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5 ORDER BY 1 + col1, 2 + col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 103,
+    "stopIndex" : 106,
+    "fragment" : "col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5 ORDER BY 1 + col2, 2 + col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 81,
+    "stopIndex" : 84,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v1.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 118,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5 ORDER BY 1 + v1.col2, 2 + v1.col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 87,
+    "stopIndex" : 93,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v2.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 118,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5 ORDER BY 1 + v2.col1, 2 + v1.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 87,
+    "stopIndex" : 93,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5 ORDER BY MAX(col1)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNSUPPORTED_EXPR_FOR_OPERATOR",
+  "sqlState" : "42K0E",
+  "messageParameters" : {
+    "invalidExprSqls" : "\"max(col1)\""
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 77,
+    "stopIndex" : 94,
+    "fragment" : "ORDER BY MAX(col1)"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5 ORDER BY MAX(col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 90,
+    "stopIndex" : 93,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5 ORDER BY MAX(v1.col1)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNSUPPORTED_EXPR_FOR_OPERATOR",
+  "sqlState" : "42K0E",
+  "messageParameters" : {
+    "invalidExprSqls" : "\"max(col1)\""
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 83,
+    "stopIndex" : 103,
+    "fragment" : "ORDER BY MAX(v1.col1)"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5 ORDER BY MAX(v1.col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 96,
+    "stopIndex" : 102,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5 ORDER BY MAX(v2.col1)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 96,
+    "stopIndex" : 102,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5 ORDER BY MAX(v2.col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 96,
+    "stopIndex" : 102,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5 ORDER BY 1 + MAX(col1), 2 + MIN(col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 115,
+    "fragment" : "col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5 ORDER BY 1 + MAX(col2), 2 + MIN(col1)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 115,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 121,
+    "stopIndex" : 127,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 121,
+    "stopIndex" : 127,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 121,
+    "stopIndex" : 127,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`sum(col2)`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 121,
+    "stopIndex" : 127,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col1 > 5 ORDER BY col1
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+7	8	9
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING col2 > 5 ORDER BY col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 92,
+    "stopIndex" : 95,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col1 > 5 ORDER BY v1.col1
+-- !query schema
+struct<a:bigint,b:bigint,c:bigint>
+-- !query output
+7	8	9
+3	4	5
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v1.col2 > 5 ORDER BY v1.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col1 > 5 ORDER BY v2.col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING v2.col2 > 5 ORDER BY v2.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 95,
+    "stopIndex" : 101,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col1 > 5 ORDER BY 1 + col1, 2 + col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col1`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 132,
+    "stopIndex" : 135,
+    "fragment" : "col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + col2 > 5 ORDER BY 1 + col2, 2 + col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 110,
+    "stopIndex" : 113,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v1.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 141,
+    "stopIndex" : 147,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + v1.col2 > 5 ORDER BY 1 + v1.col2, 2 + v1.col1
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 116,
+    "stopIndex" : 122,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v1.col1 > 5 ORDER BY 1 + v1.col1, 2 + v2.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 141,
+    "stopIndex" : 147,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + v2.col1 > 5 ORDER BY 1 + v2.col1, 2 + v1.col2
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 116,
+    "stopIndex" : 122,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col1) > 5 ORDER BY MAX(col1)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNSUPPORTED_EXPR_FOR_OPERATOR",
+  "sqlState" : "42K0E",
+  "messageParameters" : {
+    "invalidExprSqls" : "\"max(col1)\""
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 106,
+    "stopIndex" : 123,
+    "fragment" : "ORDER BY MAX(col1)"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 HAVING MAX(col2) > 5 ORDER BY MAX(col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 119,
+    "stopIndex" : 122,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col1) > 5 ORDER BY MAX(v1.col1)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNSUPPORTED_EXPR_FOR_OPERATOR",
+  "sqlState" : "42K0E",
+  "messageParameters" : {
+    "invalidExprSqls" : "\"max(col1)\""
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 112,
+    "stopIndex" : 132,
+    "fragment" : "ORDER BY MAX(v1.col1)"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v1.col2) > 5 ORDER BY MAX(v1.col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 125,
+    "stopIndex" : 131,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col1) > 5 ORDER BY MAX(v2.col1)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 125,
+    "stopIndex" : 131,
+    "fragment" : "v2.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 HAVING MAX(v2.col2) > 5 ORDER BY MAX(v2.col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v2`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 125,
+    "stopIndex" : 131,
+    "fragment" : "v2.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col1) > 5 ORDER BY 1 + MAX(col1), 2 + MIN(col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col1`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 141,
+    "stopIndex" : 144,
+    "fragment" : "col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY col1 + 1, col2 + 2 HAVING 1 + MAX(col2) > 5 ORDER BY 1 + MAX(col2), 2 + MIN(col1)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`col2`",
+    "proposal" : "`a`, `b`, `c`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 141,
+    "stopIndex" : 144,
+    "fragment" : "col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v1.col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 150,
+    "stopIndex" : 156,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v1.col2 + 2 HAVING 1 + MAX(v1.col2) > 5 ORDER BY 1 + MAX(v1.col2), 2 + MIN(v1.col1)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col2`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 150,
+    "stopIndex" : 156,
+    "fragment" : "v1.col2"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 150,
+    "stopIndex" : 156,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+SELECT SUM(col2) AS a, a + 1 AS b, b + 1 AS c FROM v1 NATURAL JOIN v2 GROUP BY v1.col1 + 1, v2.col2 + 2 HAVING 1 + MAX(v1.col1) > 5 ORDER BY 1 + MAX(v1.col1), 2 + MIN(v2.col2)
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.catalyst.ExtendedAnalysisException
+{
+  "errorClass" : "UNRESOLVED_COLUMN.WITH_SUGGESTION",
+  "sqlState" : "42703",
+  "messageParameters" : {
+    "objectName" : "`v1`.`col1`",
+    "proposal" : "`c`, `a`, `b`"
+  },
+  "queryContext" : [ {
+    "objectType" : "",
+    "objectName" : "",
+    "startIndex" : 150,
+    "stopIndex" : 156,
+    "fragment" : "v1.col1"
+  } ]
+}
+
+
+-- !query
+DROP VIEW IF EXISTS v1
+-- !query schema
+struct<>
+-- !query output
+
+
+
+-- !query
+DROP VIEW IF EXISTS v2
+-- !query schema
+struct<>
+-- !query output
+
diff --git a/sql/core/src/test/resources/sql-tests/results/order-by.sql.out b/sql/core/src/test/resources/sql-tests/results/order-by.sql.out
index 26bb94c98fe2..8a94b6ee887e 100644
--- a/sql/core/src/test/resources/sql-tests/results/order-by.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/order-by.sql.out
@@ -9,22 +9,6 @@ struct<>
 
 
 
--- !query
-CREATE OR REPLACE TEMPORARY VIEW v1 AS SELECT 1 AS col1
--- !query schema
-struct<>
--- !query output
-
-
-
--- !query
-CREATE OR REPLACE TEMPORARY VIEW v2 AS SELECT 1 AS col1
--- !query schema
-struct<>
--- !query output
-
-
-
 -- !query
 SELECT a FROM testData ORDER BY a
 -- !query schema
@@ -218,40 +202,6 @@ struct<col1:int,col1:int>
 1	10
 
 
--- !query
-SELECT
-  COUNT(DISTINCT col1)
-FROM
-  v1
-NATURAL JOIN
-  v2
-GROUP BY
-  col1
-ORDER BY
-  col1
--- !query schema
-struct<count(DISTINCT col1):bigint>
--- !query output
-1
-
-
--- !query
-SELECT
-  COUNT(DISTINCT col1)
-FROM
-  v1
-NATURAL JOIN
-  v1
-GROUP BY
-  col1
-ORDER BY
-  col1
--- !query schema
-struct<count(DISTINCT col1):bigint>
--- !query output
-1
-
-
 -- !query
 SELECT 'a' ORDER BY CAST('a' AS VARIANT)
 -- !query schema
@@ -450,19 +400,3 @@ DROP VIEW IF EXISTS testData
 struct<>
 -- !query output
 
-
-
--- !query
-DROP VIEW IF EXISTS v1
--- !query schema
-struct<>
--- !query output
-
-
-
--- !query
-DROP VIEW IF EXISTS v2
--- !query schema
-struct<>
--- !query output
-


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org