This is an automated email from the ASF dual-hosted git repository.
richardantal pushed a commit to branch 5.2
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.2 by this push:
new bb04c2b75e PHOENIX-7491 Mixed-cased alias doesn't work in select
statement of “INNER JOIN” (#2047)
bb04c2b75e is described below
commit bb04c2b75e5d069fdc8a59c184521ba6bc79c7ab
Author: Vaibhav Joshi <[email protected]>
AuthorDate: Thu Dec 19 21:46:54 2024 +0530
PHOENIX-7491 Mixed-cased alias doesn't work in select statement of “INNER
JOIN” (#2047)
---
.../org/apache/phoenix/compile/JoinCompiler.java | 5 +-
.../end2end/MixedCaseInnerJoinAliasesIT.java | 86 ++++++++++++++++++++++
2 files changed, 89 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core-client/src/main/java/org/apache/phoenix/compile/JoinCompiler.java
b/phoenix-core-client/src/main/java/org/apache/phoenix/compile/JoinCompiler.java
index c3295d2b0f..6de3f73aa8 100644
---
a/phoenix-core-client/src/main/java/org/apache/phoenix/compile/JoinCompiler.java
+++
b/phoenix-core-client/src/main/java/org/apache/phoenix/compile/JoinCompiler.java
@@ -80,7 +80,6 @@ import org.apache.phoenix.schema.PColumn;
import org.apache.phoenix.schema.PNameFactory;
import org.apache.phoenix.schema.PName;
import org.apache.phoenix.schema.PTable;
-import org.apache.phoenix.schema.PTable.IndexType;
import org.apache.phoenix.schema.PTableImpl;
import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.schema.ProjectedColumn;
@@ -863,7 +862,9 @@ public class JoinCompiler {
* The columns are pruned, so {@link ColumnResolver} should be
refreshed.
*/
DerivedTableNode newDerivedTableNode =
- NODE_FACTORY.derivedTable(this.tableNode.getAlias(),
newSubselectStatement);
+ NODE_FACTORY.derivedTable(SchemaUtil.ESCAPE_CHARACTER
+ + this.tableNode.getAlias()
+ + SchemaUtil.ESCAPE_CHARACTER,
newSubselectStatement);
TableRef newTableRef =
FromCompiler.refreshDerivedTableNode(origResolver,
newDerivedTableNode);
assert newTableRef != null;
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MixedCaseInnerJoinAliasesIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MixedCaseInnerJoinAliasesIT.java
new file mode 100644
index 0000000000..48a08301f2
--- /dev/null
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MixedCaseInnerJoinAliasesIT.java
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ */
+package org.apache.phoenix.end2end;
+
+import org.apache.phoenix.util.PropertiesUtil;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.util.Properties;
+
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.fail;
+
+public class MixedCaseInnerJoinAliasesIT extends ParallelStatsDisabledIT {
+ @BeforeClass
+ public static void setUp() throws Exception {
+
+ Connection conn = DriverManager.getConnection(getUrl(),
PropertiesUtil.deepCopy(TEST_PROPERTIES));
+ String createContractTable = "CREATE TABLE T1 (ID CHAR(256) PRIMARY
KEY, \"F\".DUMMY_COLUMN VARCHAR)";
+ conn.createStatement().execute(createContractTable);
+
+ String createContractViewSql = "CREATE VIEW V1(ROWKEY VARCHAR PRIMARY
KEY,F.COL1 VARCHAR,F.COL2 VARCHAR," +
+ "F.COL3 VARCHAR) AS SELECT * FROM T1";
+ conn.createStatement().execute(createContractViewSql);
+
+
+ String createCounterPartyTable = "CREATE TABLE T2 (ID CHAR(256)
PRIMARY KEY, \"F2\".DUMMY_COLUMN VARCHAR)";
+ conn.createStatement().execute(createCounterPartyTable);
+ String createCounterPartyViewSql = "CREATE VIEW V2(ROWKEY VARCHAR
PRIMARY KEY,F2.COL1 VARCHAR," +
+ "F2.COL2 VARCHAR,F2.COL3 VARCHAR) AS SELECT * FROM T2";
+ conn.createStatement().execute(createCounterPartyViewSql);
+ }
+
+ @Test
+ public void testInInnerJoinAliasesWithoutQuotes() {
+ Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+ try {
+ Connection conn = DriverManager.getConnection(getUrl(), props);
+
+ String selectQuery = "SELECT MixedCaseAlias1.\"COL1\" AS
\"MixedCaseAlias1_COL1\", " +
+ "\"MixedCaseAlias2\".\"COL2\" AS \"MixedCaseAlias2_COL2\",
" +
+ "\"MixedCaseAlias2\".\"COL3\" AS \"MixedCaseAlias2_COL3\"
" +
+ "FROM (SELECT \"COL1\", \"COL2\" FROM V1) AS
MixedCaseAlias1 " +
+ "INNER JOIN V2 AS \"MixedCaseAlias2\" " +
+ "ON (MixedCaseAlias1.\"COL1\" =
\"MixedCaseAlias2\".\"COL1\")";
+ conn.createStatement().executeQuery(selectQuery);
+ } catch (Exception e) {
+ fail(e.getClass().getSimpleName() + " was not expectedly thrown: "
+ e.getMessage());
+ }
+ }
+
+ @Test
+ public void testInInnerJoinWithAliasesWithQuotes() {
+ try {
+ Connection conn = DriverManager.getConnection(getUrl(),
+ PropertiesUtil.deepCopy(TEST_PROPERTIES));
+
+ String selectQuery = "SELECT \"MixedCaseAlias1\".\"COL1\" AS
\"MixedCaseAlias1_COL1\", " +
+ "\"MixedCaseAlias2\".\"COL2\" AS \"MixedCaseAlias2_COL2\",
" +
+ "\"MixedCaseAlias2\".\"COL3\" as \"MixedCaseAlias2_COL3\"
" +
+ "FROM (SELECT \"COL1\", \"COL2\" FROM V1) AS
\"MixedCaseAlias1\" " +
+ "INNER JOIN V2 AS \"MixedCaseAlias2\" ON " +
+ "(\"MixedCaseAlias1\".\"COL1\" =
\"MixedCaseAlias2\".\"COL1\")";
+ conn.createStatement().executeQuery(selectQuery);
+ } catch (Exception e) {
+ fail(e.getClass().getSimpleName() + " was not expectedly thrown: "
+ e.getMessage());
+ }
+ }
+}
\ No newline at end of file
