Merge branch 'master' of https://github.com/AlexCovizzi/vscode-sqlite …

…into master

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.14.1 (04 Jun 2022)
+
+Fixed
+
+1. Fixed bug in the SQL parser that caused queries with `CREATE TRIGGER` to be parsed incorrectely ([#210](https://github.com/AlexCovizzi/vscode-sqlite/issues/210))
+
 ## 0.14.0 (06 Nov 2021)
 
 Added

package.json

@@ -3,7 +3,7 @@
     "icon": "resources/icon/icon_128x128.png",
     "displayName": "SQLite",
     "description": "Explore and query SQLite databases.",
-    "version": "0.14.0",
+    "version": "0.14.1",
     "publisher": "alexcvzz",
     "repository": {
         "url": "https://github.com/AlexCovizzi/vscode-sqlite",

src/sqlite/queryParser.ts

@@ -5,6 +5,7 @@ export function extractStatements(query: string): Statement[] {
 
     let statement: Statement|undefined;
     let isStmt = false;
+    let isInternalBlock = false;
     let isString = false;
     let isComment = false;
     let isCommand = false;
@@ -18,6 +19,7 @@ export function extractStatements(query: string): Statement[] {
             let char = line[charIndex];
             let prevChar = charIndex>0? line[charIndex-1] : undefined;
             let nextChar = charIndex<line.length-1? line[charIndex+1] : undefined;
+            let lastWord = (n: number) => line.substring(charIndex-n+1, charIndex+1)
 
             if (isStmt) {
                 if (statement) statement.sql += char;
@@ -28,7 +30,13 @@ export function extractStatements(query: string): Statement[] {
                 } else if (!isString && char === '/' && nextChar === '*') {
                     isComment = true;
                     commentChar = '/';
-                } else if (!isString && !isComment && char === ';') {
+                } else if (!isString && !isComment && lastWord(5).toLowerCase() === "begin") {
+                    isInternalBlock = true;
+                } else if (!isString && !isComment && lastWord(3).toLowerCase() === "end") {
+                    isInternalBlock = false;
+                } else if (!isString && !isComment && isInternalBlock && lastWord(11).toLowerCase() === "transaction") {
+                    isInternalBlock = false;
+                } else if (!isString && !isComment && !isInternalBlock && char === ';') {
                     isStmt = false;
                     if (statement) {
                         statement.position.end = [lineIndex, charIndex];

tests/unit/sqlite/queryParser.test.ts

@@ -110,5 +110,33 @@ describe("QueryParser Tests", function () {
         expect(actual.map(s => s.sql)).toEqual(expected);
     });
 
+    test("should parse query with TRIGGER and SELECT (issue #210)", function() {
+        let query = `CREATE TRIGGER newWidgetSale BEFORE UPDATE ON widgetSale
+        BEGIN
+            SELECT RAISE(ROLLBACK, 'cannot update table "widget sale"') FROM widgetSale WHERE id = NEW.id and reconciled = 1;
+        END
+        ;`
+
+        let actual = queryParser.extractStatements(query);
+        let expected = [query];
+
+        expect(actual.map(s => s.sql)).toEqual(expected);
+    });
+
+    test("should parse query with transaction", function() {
+        let query = `BEGIN TRANSACTION; -- start
+        SELECT RAISE(ROLLBACK, 'cannot update table "widget sale"') FROM widgetSale WHERE id = NEW.id and reconciled = 1;
+        END TRANSACTION;`
+
+        let actual = queryParser.extractStatements(query);
+        let expected = [
+            "BEGIN TRANSACTION;",
+            "SELECT RAISE(ROLLBACK, 'cannot update table \"widget sale\"') FROM widgetSale WHERE id = NEW.id and reconciled = 1;",
+            "END TRANSACTION;"
+        ];
+
+        expect(actual.map(s => s.sql)).toEqual(expected);
+    });
+
 
 });