Fixes to SQL runner

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

.vscode/launch.json

@@ -39,7 +39,7 @@
 				"type": "npm",
 				"script": "compile:tests"
 			},
-			"args": [],
+			"args": ["sqlRunner1"],
 			"env": {
 				"INCLUDE_DIR": "${workspaceFolder}"
 			}

language/linter.ts

@@ -733,7 +733,7 @@ export default class Linter {
 
                     if (rules.SQLRunner) {
                       // For running SQL statements
-                      const validStatements = [`declare`, `with`, `select`].includes(statement[2].value.toLowerCase());
+                      const validStatements = [`declare`, `with`, `select`, `merge`, `update`].includes(statement.find((t, i) => i >= 2 && t.type !== `newline`)?.value.toLowerCase());
                       if (validStatements) {
                         errors.push({
                           type: `SQLRunner`,

tests/suite/linter.js

@@ -3493,4 +3493,65 @@ exports.range_1 = async () => {
     { position: 235, end: 236 },
     { position: 241, end: 242 }
   ]);
-}
+}
+
+exports.sqlRunner1_1 = async () => {
+  const lines = [
+    `**free`,
+    `EXEC SQL`,
+    `  DECLARE CUSCUR CURSOR FOR`,
+    `    SELECT CUSNO FROM CUSTOMER;`,
+    ``,
+    `EXEC SQL`,
+    `  OPEN CUSCUR;`,
+    ``,
+    `EXEC SQL`,
+    `  FETCH NEXT FROM CUSCUR INTO :cust.CUSNO;`,
+    ``,
+    `EXEC SQL`,
+    `  CLOSE CUSCUR;`,
+    ``,
+  ].join(`\n`);
+
+  const cache = await parser.getDocs(uri, lines, {ignoreCache: true, withIncludes: true});
+  const { errors } = Linter.getErrors({ uri, content: lines }, {
+    SQLRunner: true
+  }, cache);
+
+  assert.strictEqual(errors.length, 1);
+  assert.deepStrictEqual(errors[0], {
+    type: 'SQLRunner',
+    offset: { position: 7, end: 74 },
+    newValue: 'EXEC SQL\n  DECLARE CUSCUR CURSOR FOR\n    SELECT CUSNO FROM CUSTOMER'
+  });
+};
+
+exports.sqlRunner1_b = async () => {
+  const lines = [
+    `**free`,
+    `EXEC SQL DECLARE CUSCUR CURSOR FOR`,
+    `    SELECT CUSNO FROM CUSTOMER;`,
+    ``,
+    `EXEC SQL`,
+    `  OPEN CUSCUR;`,
+    ``,
+    `EXEC SQL`,
+    `  FETCH NEXT FROM CUSCUR INTO :cust.CUSNO;`,
+    ``,
+    `EXEC SQL`,
+    `  CLOSE CUSCUR;`,
+    ``,
+  ].join(`\n`);
+
+  const cache = await parser.getDocs(uri, lines, {ignoreCache: true, withIncludes: true});
+  const { errors } = Linter.getErrors({ uri, content: lines }, {
+    SQLRunner: true
+  }, cache);
+
+  assert.strictEqual(errors.length, 1);
+  assert.deepStrictEqual(errors[0], {
+    type: 'SQLRunner',
+    offset: { position: 7, end: 72 },
+    newValue: 'EXEC SQL DECLARE CUSCUR CURSOR FOR\n    SELECT CUSNO FROM CUSTOMER'
+  });
+};