#42, #43. where LIKE

Although these two issues appear to be similar, they are actually two different bugs. #42 was matching the wildcard string anywhere in the field. If 'Your%' was specified, it was supposed to be that 'Your' had to be at the line start. #43. from SUB-QUERY was converting everything in the sub-query to upper case. So if you had any type of string comparison and it was specifying a string that had lower case, and the data was lower case - it was not matching since the lookup string had been converted to upper case.
demmings · May 2, 2023 · df5c29b · df5c29b
1 parent e9b7761
commit df5c29b
Show file tree

Hide file tree

Showing 8 changed files with 2,653 additions and 2,509 deletions.
diff --git a/coverage/tests.lcov b/coverage/tests.lcov
diff --git a/dist/gssql.js b/dist/gssql.js
@@ -2525,7 +2525,7 @@ class SelectTables {
         }
 
         // @ts-ignore
-        const expanded = rightValue.replace(/%/g, ".*").replace(/_/g, ".");
+        const expanded = "^" + rightValue.replace(/%/g, ".*").replace(/_/g, ".");
 
         const result = leftValue.search(expanded);
         return result !== -1;
@@ -3930,8 +3930,9 @@ class TableFields {
 
                 //  When subquery table data becomes data for the derived table name, references to
                 //  original table names in column output needs to be changed to new derived table name.
-                if (columnTableNameReplacement !== null && columnOutput.startsWith(`${fld.originalTable}.`)) {
-                    columnOutput = columnOutput.replace(`${fld.originalTable}.`, `${columnTableNameReplacement}.`);
+                if (columnTableNameReplacement !== null) {
+                    const matchingTableIndex = columnOutput.toUpperCase().indexOf(`${fld.originalTable}.`);
+                    columnOutput = matchingTableIndex === 0 ? columnTableNameReplacement + columnOutput.slice(matchingTableIndex + fld.originalTable.length) : columnOutput;
                 }
                 columnTitles.push(columnOutput);
             }
@@ -6068,8 +6069,8 @@ class SelectKeywordAnalysis {
     static parseForCorrelatedSubQuery(selectField) {
         let subQueryAst = null;
 
-        const regExp = /\(\s*(SELECT[\s\S]+)\)/;
-        const matches = regExp.exec(selectField.toUpperCase());
+        const regExp = /\(\s*(SELECT[\s\S]+)\)/i;
+        const matches = regExp.exec(selectField);
 
         if (matches !== null && matches.length > 1) {
             subQueryAst = SqlParse.sql2ast(matches[1]);
@@ -6437,7 +6438,7 @@ class TableData {       //  skipcq: JS-0128
         //  Only change our CACHE STATUS if we have a lock.
         const lock = LockService.getScriptLock();
         try {
-            lock.waitLock(10000); // wait 10 seconds for others' use of the code section and lock to stop and then proceed
+            lock.waitLock(100000); // wait 100 seconds for others' use of the code section and lock to stop and then proceed
         } catch (e) {
             throw new Error("Cache lock failed");
         }
@@ -6536,7 +6537,7 @@ class TableData {       //  skipcq: JS-0128
         //  Update status that cache is updated.
         const lock = LockService.getScriptLock();
         try {
-            lock.waitLock(10000); // wait 10 seconds for others' use of the code section and lock to stop and then proceed
+            lock.waitLock(100000); // wait 100 seconds for others' use of the code section and lock to stop and then proceed
         } catch (e) {
             throw new Error("Cache lock failed");
         }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@demmings/gssql",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "Google Sheets QUERY function replacement using real SQL select syntax.",
   "main": "testGsSql.js",
   "files": ["./src", "src", "img", "dist"],

diff --git a/src/SimpleParser.js b/src/SimpleParser.js
@@ -1175,8 +1175,8 @@ class SelectKeywordAnalysis {
     static parseForCorrelatedSubQuery(selectField) {
         let subQueryAst = null;
 
-        const regExp = /\(\s*(SELECT[\s\S]+)\)/;
-        const matches = regExp.exec(selectField.toUpperCase());
+        const regExp = /\(\s*(SELECT[\s\S]+)\)/i;
+        const matches = regExp.exec(selectField);
 
         if (matches !== null && matches.length > 1) {
             subQueryAst = SqlParse.sql2ast(matches[1]);

diff --git a/src/SqlTest.js b/src/SqlTest.js
@@ -3717,6 +3717,66 @@ class SqlTester {
         return this.isEqual("joinBigTables1", data.length, expected);
     }
 
+    selectWhereLike3() {
+        let stmt = "select id, title, author_id from books where title like 'Your%'";
+
+        let data = new TestSql()
+            .addTableData("books", this.bookTable())
+            .enableColumnTitle(true)
+            .execute(stmt);
+
+        let expected = [["id", "title", "author_id"],
+        ["2", "Your Trip", "15"],
+        ["6", "Your Happy Life", "15"]];
+
+        return this.isEqual("selectWhereLike3", data, expected);
+    }
+
+    selectWhereLike4() {
+        let stmt = "select id, title, author_id from books where title like '%Your%'";
+
+        let data = new TestSql()
+            .addTableData("books", this.bookTable())
+            .enableColumnTitle(true)
+            .execute(stmt);
+
+        let expected = [["id", "title", "author_id"],
+        ["2", "Your Trip", "15"],
+        ["4", "Dream Your Life", "11"],
+        ["6", "Your Happy Life", "15"]];
+
+        return this.isEqual("selectWhereLike4", data, expected);
+    }
+
+    selectFromSubQuery8() {
+        let stmt = "Select * from (select * from books where title like 'Your%') as mybooks";
+
+        let data = new TestSql()
+            .addTableData("books", this.bookTable())
+            .enableColumnTitle(true)
+            .execute(stmt);
+
+        let expected = [["MYBOOKS.ID", "MYBOOKS.TITLE", "MYBOOKS.TYPE", "MYBOOKS.AUTHOR_ID", "MYBOOKS.EDITOR_ID", "MYBOOKS.TRANSLATOR_ID"],
+        ["2", "Your Trip", "translated", "15", "22", "32"],
+        ["6", "Your Happy Life", "translated", "15", "22", "33"]];
+
+        return this.isEqual("selectFromSubQuery8", data, expected);
+    }
+
+    selectFromSubQuery9() {
+        let stmt = "Select * from (select * from books where title = 'Your Happy Life') as mybooks";
+
+        let data = new TestSql()
+            .addTableData("books", this.bookTable())
+            .enableColumnTitle(true)
+            .execute(stmt);
+
+        let expected = [["MYBOOKS.ID", "MYBOOKS.TITLE", "MYBOOKS.TYPE", "MYBOOKS.AUTHOR_ID", "MYBOOKS.EDITOR_ID", "MYBOOKS.TRANSLATOR_ID"],
+        ["6", "Your Happy Life", "translated", "15", "22", "33"]];
+
+        return this.isEqual("selectFromSubQuery9", data, expected);
+    }
+
     //  S T A R T   O T H E R   T E S T S
     removeTrailingEmptyRecords() {
         let authors = this.authorsTable();
@@ -4359,7 +4419,7 @@ class SqlTester {
 
     badJoin5() {
         let stmt = "select invoice, name, title from customers inner join booksales on 'BB' + substr(booksales.customer_id, 2, 1) = 'BB' + substr(customers.id, 2, 1) join books on 'CC' + books.badColumnName = 'CC' + booksales.book_id";
- 
+
         let testSQL = new TestSql()
             .addTableData("books", this.bookTable())
             .addTableData("booksales", this.bookSalesTable())
@@ -4776,6 +4836,10 @@ function testerSql() {
     //  This test causes problems on gsSqlTest sheet (too big)
     // result = result && tester.joinBigTables1();
     result = result && tester.removeTrailingEmptyRecords();
+    result = result && tester.selectWhereLike3();
+    result = result && tester.selectWhereLike4();
+    result = result && tester.selectFromSubQuery8();
+    result = result && tester.selectFromSubQuery9();
 
     Logger.log("============================================================================");
 

diff --git a/src/TableData.js b/src/TableData.js
@@ -258,7 +258,7 @@ class TableData {       //  skipcq: JS-0128
         //  Only change our CACHE STATUS if we have a lock.
         const lock = LockService.getScriptLock();
         try {
-            lock.waitLock(10000); // wait 10 seconds for others' use of the code section and lock to stop and then proceed
+            lock.waitLock(100000); // wait 100 seconds for others' use of the code section and lock to stop and then proceed
         } catch (e) {
             throw new Error("Cache lock failed");
         }
@@ -357,7 +357,7 @@ class TableData {       //  skipcq: JS-0128
         //  Update status that cache is updated.
         const lock = LockService.getScriptLock();
         try {
-            lock.waitLock(10000); // wait 10 seconds for others' use of the code section and lock to stop and then proceed
+            lock.waitLock(100000); // wait 100 seconds for others' use of the code section and lock to stop and then proceed
         } catch (e) {
             throw new Error("Cache lock failed");
         }

diff --git a/src/Views.js b/src/Views.js
@@ -853,7 +853,7 @@ class SelectTables {
         }
 
         // @ts-ignore
-        const expanded = rightValue.replace(/%/g, ".*").replace(/_/g, ".");
+        const expanded = "^" + rightValue.replace(/%/g, ".*").replace(/_/g, ".");
 
         const result = leftValue.search(expanded);
         return result !== -1;
@@ -2258,8 +2258,9 @@ class TableFields {
 
                 //  When subquery table data becomes data for the derived table name, references to
                 //  original table names in column output needs to be changed to new derived table name.
-                if (columnTableNameReplacement !== null && columnOutput.startsWith(`${fld.originalTable}.`)) {
-                    columnOutput = columnOutput.replace(`${fld.originalTable}.`, `${columnTableNameReplacement}.`);
+                if (columnTableNameReplacement !== null) {
+                    const matchingTableIndex = columnOutput.toUpperCase().indexOf(`${fld.originalTable}.`);
+                    columnOutput = matchingTableIndex === 0 ? columnTableNameReplacement + columnOutput.slice(matchingTableIndex + fld.originalTable.length) : columnOutput;
                 }
                 columnTitles.push(columnOutput);
             }