Update tests for smarter aliasing

.github/workflows/codeql.yml

@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '16 4 * * 1'
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze Actions
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      security-events: write
+      packages: read
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      with:
+        persist-credentials: false
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@c793b717bc78562f491db7b0e93a3a178b099162 # v4
+      with:
+        languages: actions
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@c793b717bc78562f491db7b0e93a3a178b099162 # v4
+      with:
+        category: "/language:actions"

NOTICE.txt

@@ -1,5 +1,5 @@
 Apache DataFusion
-Copyright 2019-2024 The Apache Software Foundation
+Copyright 2019-2026 The Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (http://www.apache.org/).

data/sqlite/index/random/10/slt_good_1.slt

@@ -27121,31 +27121,31 @@ SELECT DISTINCT + CAST ( NULL AS INTEGER ) * - col4 AS col4 FROM tab4 cor0 WHERE
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 45
 # Datafusion - Expected - 0
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(45\) AS col0" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) \- count\(Int64\(1\)\) AS count\(\*\) AS col0" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(45\) AS col0" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) \- count\(Int64\(1\)\) (AS count\(\*\) )?AS col0" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT 45 AS col0, COUNT ( * ) - COUNT ( * ) col0 FROM tab0 WHERE 87 < - + col4
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 45
 # Datafusion - Expected - 0
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(45\) AS col0" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) \- count\(Int64\(1\)\) AS count\(\*\) AS col0" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(45\) AS col0" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) \- count\(Int64\(1\)\) (AS count\(\*\) )?AS col0" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT 45 AS col0, COUNT ( * ) - COUNT ( * ) col0 FROM tab1 WHERE 87 < - + col4
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 45
 # Datafusion - Expected - 0
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(45\) AS col0" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) \- count\(Int64\(1\)\) AS count\(\*\) AS col0" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(45\) AS col0" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) \- count\(Int64\(1\)\) (AS count\(\*\) )?AS col0" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT 45 AS col0, COUNT ( * ) - COUNT ( * ) col0 FROM tab2 WHERE 87 < - + col4
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 45
 # Datafusion - Expected - 0
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(45\) AS col0" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) \- count\(Int64\(1\)\) AS count\(\*\) AS col0" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(45\) AS col0" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) \- count\(Int64\(1\)\) (AS count\(\*\) )?AS col0" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT 45 AS col0, COUNT ( * ) - COUNT ( * ) col0 FROM tab3 WHERE 87 < - + col4
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 45
 # Datafusion - Expected - 0
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(45\) AS col0" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) \- count\(Int64\(1\)\) AS count\(\*\) AS col0" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(45\) AS col0" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) \- count\(Int64\(1\)\) (AS count\(\*\) )?AS col0" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT 45 AS col0, COUNT ( * ) - COUNT ( * ) col0 FROM tab4 WHERE 87 < - + col4
 
 # Datafusion - Types were automatically converted from:

data/sqlite/index/random/10/slt_good_10.slt

@@ -8211,31 +8211,31 @@ SELECT + 89 FROM tab4 AS cor0 WHERE NULL >= + col4
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - -59
 # Datafusion - Expected - 0
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-59\) AS col5" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) AS col5" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-59\) AS col5" at position 0 and "count\(Int64\(1\)\) (AS count\(\*\) )?AS col5" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT ALL - 59 col5, + COUNT ( * ) AS col5 FROM tab0 AS cor0 WHERE 71 / - col0 >= NULL
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - -59
 # Datafusion - Expected - 0
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-59\) AS col5" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) AS col5" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-59\) AS col5" at position 0 and "count\(Int64\(1\)\) (AS count\(\*\) )?AS col5" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT ALL - 59 col5, + COUNT ( * ) AS col5 FROM tab1 AS cor0 WHERE 71 / - col0 >= NULL
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - -59
 # Datafusion - Expected - 0
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-59\) AS col5" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) AS col5" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-59\) AS col5" at position 0 and "count\(Int64\(1\)\) (AS count\(\*\) )?AS col5" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT ALL - 59 col5, + COUNT ( * ) AS col5 FROM tab2 AS cor0 WHERE 71 / - col0 >= NULL
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - -59
 # Datafusion - Expected - 0
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-59\) AS col5" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) AS col5" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-59\) AS col5" at position 0 and "count\(Int64\(1\)\) (AS count\(\*\) )?AS col5" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT ALL - 59 col5, + COUNT ( * ) AS col5 FROM tab3 AS cor0 WHERE 71 / - col0 >= NULL
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - -59
 # Datafusion - Expected - 0
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-59\) AS col5" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) AS col5" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-59\) AS col5" at position 0 and "count\(Int64\(1\)\) (AS count\(\*\) )?AS col5" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT ALL - 59 col5, + COUNT ( * ) AS col5 FROM tab4 AS cor0 WHERE 71 / - col0 >= NULL
 
 # Datafusion - Types were automatically converted from:

data/sqlite/index/random/10/slt_good_11.slt

@@ -25669,31 +25669,31 @@ SELECT 79 - + ( + 20 ) * + col3 AS col4 FROM tab4 AS cor0 WHERE col4 IS NOT NULL
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 0
 # Datafusion - Expected - 7
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "count\(Int64\(1\)\) AS count\(\*\) AS col4" at position 0 and "Int64\(7\) AS col4" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "count\(Int64\(1\)\) (AS count\(\*\) )?AS col4" at position 0 and "Int64\(7\) AS col4" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT + COUNT ( * ) AS col4, 7 AS col4 FROM tab0 WHERE NOT NULL >= + col1
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 0
 # Datafusion - Expected - 7
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "count\(Int64\(1\)\) AS count\(\*\) AS col4" at position 0 and "Int64\(7\) AS col4" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "count\(Int64\(1\)\) (AS count\(\*\) )?AS col4" at position 0 and "Int64\(7\) AS col4" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT + COUNT ( * ) AS col4, 7 AS col4 FROM tab1 WHERE NOT NULL >= + col1
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 0
 # Datafusion - Expected - 7
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "count\(Int64\(1\)\) AS count\(\*\) AS col4" at position 0 and "Int64\(7\) AS col4" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "count\(Int64\(1\)\) (AS count\(\*\) )?AS col4" at position 0 and "Int64\(7\) AS col4" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT + COUNT ( * ) AS col4, 7 AS col4 FROM tab2 WHERE NOT NULL >= + col1
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 0
 # Datafusion - Expected - 7
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "count\(Int64\(1\)\) AS count\(\*\) AS col4" at position 0 and "Int64\(7\) AS col4" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "count\(Int64\(1\)\) (AS count\(\*\) )?AS col4" at position 0 and "Int64\(7\) AS col4" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT + COUNT ( * ) AS col4, 7 AS col4 FROM tab3 WHERE NOT NULL >= + col1
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - 0
 # Datafusion - Expected - 7
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "count\(Int64\(1\)\) AS count\(\*\) AS col4" at position 0 and "Int64\(7\) AS col4" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "count\(Int64\(1\)\) (AS count\(\*\) )?AS col4" at position 0 and "Int64\(7\) AS col4" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT + COUNT ( * ) AS col4, 7 AS col4 FROM tab4 WHERE NOT NULL >= + col1
 
 query I rowsort label-4190
@@ -28644,31 +28644,31 @@ SELECT col4 FROM tab4 AS cor0 WHERE NULL < NULL
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - -78
 # Datafusion - Expected - 10
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-78\) AS col2" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) AS col2" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-78\) AS col2" at position 0 and "count\(Int64\(1\)\) (AS count\(\*\) )?AS col2" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT DISTINCT - 78 AS col2, COUNT ( * ) AS col2 FROM tab0 AS cor0 WHERE NOT NULL IS NOT NULL
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - -78
 # Datafusion - Expected - 10
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-78\) AS col2" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) AS col2" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-78\) AS col2" at position 0 and "count\(Int64\(1\)\) (AS count\(\*\) )?AS col2" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT DISTINCT - 78 AS col2, COUNT ( * ) AS col2 FROM tab1 AS cor0 WHERE NOT NULL IS NOT NULL
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - -78
 # Datafusion - Expected - 10
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-78\) AS col2" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) AS col2" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-78\) AS col2" at position 0 and "count\(Int64\(1\)\) (AS count\(\*\) )?AS col2" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT DISTINCT - 78 AS col2, COUNT ( * ) AS col2 FROM tab2 AS cor0 WHERE NOT NULL IS NOT NULL
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - -78
 # Datafusion - Expected - 10
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-78\) AS col2" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) AS col2" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-78\) AS col2" at position 0 and "count\(Int64\(1\)\) (AS count\(\*\) )?AS col2" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT DISTINCT - 78 AS col2, COUNT ( * ) AS col2 FROM tab3 AS cor0 WHERE NOT NULL IS NOT NULL
 
 # Datafusion - Datafusion expected results:
 # Datafusion - Expected - -78
 # Datafusion - Expected - 10
-query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-78\) AS col2" at position 0 and "count\(Int64\(1\)\) AS count\(\*\) AS col2" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
+query error DataFusion error: Error during planning: Projections require unique expression names but the expression "Int64\(\-78\) AS col2" at position 0 and "count\(Int64\(1\)\) (AS count\(\*\) )?AS col2" at position 1 have the same name\. Consider aliasing \("AS"\) one of them\.
 SELECT DISTINCT - 78 AS col2, COUNT ( * ) AS col2 FROM tab4 AS cor0 WHERE NOT NULL IS NOT NULL
 
 # Datafusion - Types were automatically converted from: