From b4a68de6df54f14fef94a0c188e3f67e6c212624 Mon Sep 17 00:00:00 2001 From: James Cor Date: Mon, 26 Aug 2024 11:58:24 -0700 Subject: [PATCH 1/3] adding test case for case insensitive key lookups --- enginetest/queries/join_queries.go | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/enginetest/queries/join_queries.go b/enginetest/queries/join_queries.go index ab7aef1901..76415a0be9 100644 --- a/enginetest/queries/join_queries.go +++ b/enginetest/queries/join_queries.go @@ -1161,6 +1161,35 @@ var JoinScriptTests = []ScriptTest{ }, }, }, + { + Name: "case insensitive key lookup", + SetUpScript: []string{ + "CREATE TABLE DEPARTMENTS (ID VARCHAR(8) PRIMARY KEY, NAME VARCHAR(255));", + "CREATE TABLE EMPLOYEES (ID VARCHAR(8) PRIMARY KEY, FIRSTNAME VARCHAR(255), DEPARTMENT_ID VARCHAR(8));", + "INSERT INTO DEPARTMENTS (ID, NAME) VALUES ('101', 'Human Resources'), ('102', 'Finance'), ('103', 'IT');", + "INSERT INTO EMPLOYEES (ID, FIRSTNAME,DEPARTMENT_ID) VALUES ('001', 'John', '101'), ('002', 'Jane','102'), ('003', 'Emily','103');", + }, + Assertions: []ScriptTestAssertion{ + { + Query: "SELECT * FROM EMPLOYEES e INNER JOIN DEPARTMENTS d ON e.DEPARTMENT_ID = d.ID WHERE e.DEPARTMENT_ID = '102';", + Expected: []sql.Row{ + {"002", "Jane", "102", "102", "Finance"}, + }, + }, + { + Query: "SELECT * FROM EMPLOYEES e INNER JOIN DEPARTMENTS d ON e.department_id = d.ID WHERE e.department_id = '102';", + Expected: []sql.Row{ + {"002", "Jane", "102", "102", "Finance"}, + }, + }, + { + Query: "SELECT * FROM EMPLOYEES e INNER JOIN DEPARTMENTS d ON e.DePaRtMeNt_Id = d.ID WHERE e.dEpArTmEnT_iD = '102';", + Expected: []sql.Row{ + {"002", "Jane", "102", "102", "Finance"}, + }, + }, + }, + }, } var LateralJoinScriptTests = []ScriptTest{ From b3000ef7b7bb5f90339c5b64bda13698f0852825 Mon Sep 17 00:00:00 2001 From: jycor Date: Mon, 26 Aug 2024 19:01:19 +0000 Subject: [PATCH 2/3] [ga-format-pr] Run ./format_repo.sh to fix formatting --- enginetest/queries/join_queries.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/enginetest/queries/join_queries.go b/enginetest/queries/join_queries.go index 76415a0be9..6c923069bc 100644 --- a/enginetest/queries/join_queries.go +++ b/enginetest/queries/join_queries.go @@ -1162,14 +1162,14 @@ var JoinScriptTests = []ScriptTest{ }, }, { - Name: "case insensitive key lookup", + Name: "case insensitive key lookup", SetUpScript: []string{ "CREATE TABLE DEPARTMENTS (ID VARCHAR(8) PRIMARY KEY, NAME VARCHAR(255));", "CREATE TABLE EMPLOYEES (ID VARCHAR(8) PRIMARY KEY, FIRSTNAME VARCHAR(255), DEPARTMENT_ID VARCHAR(8));", "INSERT INTO DEPARTMENTS (ID, NAME) VALUES ('101', 'Human Resources'), ('102', 'Finance'), ('103', 'IT');", "INSERT INTO EMPLOYEES (ID, FIRSTNAME,DEPARTMENT_ID) VALUES ('001', 'John', '101'), ('002', 'Jane','102'), ('003', 'Emily','103');", }, - Assertions: []ScriptTestAssertion{ + Assertions: []ScriptTestAssertion{ { Query: "SELECT * FROM EMPLOYEES e INNER JOIN DEPARTMENTS d ON e.DEPARTMENT_ID = d.ID WHERE e.DEPARTMENT_ID = '102';", Expected: []sql.Row{ From 7e0e81f06e5ac92f6db0d4f32425edf7d9932958 Mon Sep 17 00:00:00 2001 From: James Cor Date: Mon, 26 Aug 2024 13:44:19 -0700 Subject: [PATCH 3/3] moving test --- enginetest/join_op_tests.go | 31 ++++++++++++++++++++++++++++++ enginetest/queries/join_queries.go | 29 ---------------------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/enginetest/join_op_tests.go b/enginetest/join_op_tests.go index 0b27071e73..8bc87282ea 100644 --- a/enginetest/join_op_tests.go +++ b/enginetest/join_op_tests.go @@ -1873,6 +1873,37 @@ SELECT SUM(x) FROM xy WHERE x IN ( }, }, }, + { + name: "case insensitive key column names", + setup: [][]string{ + { + "CREATE TABLE DEPARTMENTS (ID VARCHAR(8) PRIMARY KEY, NAME VARCHAR(255));", + "CREATE TABLE EMPLOYEES (ID VARCHAR(8) PRIMARY KEY, FIRSTNAME VARCHAR(255), DEPARTMENT_ID VARCHAR(8));", + "INSERT INTO DEPARTMENTS (ID, NAME) VALUES ('101', 'Human Resources'), ('102', 'Finance'), ('103', 'IT');", + "INSERT INTO EMPLOYEES (ID, FIRSTNAME,DEPARTMENT_ID) VALUES ('001', 'John', '101'), ('002', 'Jane','102'), ('003', 'Emily','103');", + }, + }, + tests: []JoinOpTests{ + { + Query: "SELECT * FROM EMPLOYEES e INNER JOIN DEPARTMENTS d ON e.DEPARTMENT_ID = d.ID WHERE e.DEPARTMENT_ID = '102';", + Expected: []sql.Row{ + {"002", "Jane", "102", "102", "Finance"}, + }, + }, + { + Query: "SELECT * FROM EMPLOYEES e INNER JOIN DEPARTMENTS d ON e.department_id = d.ID WHERE e.department_id = '102';", + Expected: []sql.Row{ + {"002", "Jane", "102", "102", "Finance"}, + }, + }, + { + Query: "SELECT * FROM EMPLOYEES e INNER JOIN DEPARTMENTS d ON e.DePaRtMeNt_Id = d.ID WHERE e.dEpArTmEnT_iD = '102';", + Expected: []sql.Row{ + {"002", "Jane", "102", "102", "Finance"}, + }, + }, + }, + }, } var rangeJoinOpTests = []JoinOpTests{ diff --git a/enginetest/queries/join_queries.go b/enginetest/queries/join_queries.go index 6c923069bc..ab7aef1901 100644 --- a/enginetest/queries/join_queries.go +++ b/enginetest/queries/join_queries.go @@ -1161,35 +1161,6 @@ var JoinScriptTests = []ScriptTest{ }, }, }, - { - Name: "case insensitive key lookup", - SetUpScript: []string{ - "CREATE TABLE DEPARTMENTS (ID VARCHAR(8) PRIMARY KEY, NAME VARCHAR(255));", - "CREATE TABLE EMPLOYEES (ID VARCHAR(8) PRIMARY KEY, FIRSTNAME VARCHAR(255), DEPARTMENT_ID VARCHAR(8));", - "INSERT INTO DEPARTMENTS (ID, NAME) VALUES ('101', 'Human Resources'), ('102', 'Finance'), ('103', 'IT');", - "INSERT INTO EMPLOYEES (ID, FIRSTNAME,DEPARTMENT_ID) VALUES ('001', 'John', '101'), ('002', 'Jane','102'), ('003', 'Emily','103');", - }, - Assertions: []ScriptTestAssertion{ - { - Query: "SELECT * FROM EMPLOYEES e INNER JOIN DEPARTMENTS d ON e.DEPARTMENT_ID = d.ID WHERE e.DEPARTMENT_ID = '102';", - Expected: []sql.Row{ - {"002", "Jane", "102", "102", "Finance"}, - }, - }, - { - Query: "SELECT * FROM EMPLOYEES e INNER JOIN DEPARTMENTS d ON e.department_id = d.ID WHERE e.department_id = '102';", - Expected: []sql.Row{ - {"002", "Jane", "102", "102", "Finance"}, - }, - }, - { - Query: "SELECT * FROM EMPLOYEES e INNER JOIN DEPARTMENTS d ON e.DePaRtMeNt_Id = d.ID WHERE e.dEpArTmEnT_iD = '102';", - Expected: []sql.Row{ - {"002", "Jane", "102", "102", "Finance"}, - }, - }, - }, - }, } var LateralJoinScriptTests = []ScriptTest{