Multiple sqls in the one file (joe-re#190)

* bumpup version to 1.5.1

* enable to lint multiple sqls in the same file

Author: joe-re

package.json

@@ -2,7 +2,7 @@
   "name": "sql-language-server",
   "displayName": "SQL Language Server",
   "description": "SQL Language Server Extension for VSC",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "main": "./packages/client/out/extension",
   "repository": {
     "type": "git",

packages/sql-parser/base/fromClauseParser.js

@@ -386,3 +386,4 @@ type FromClauseParserResult = {
 
 export function parseFromClause(sql: string): FromClauseParserResult
 export function parse(sql: string): AST
+export function parseAll(sql: string): AST[]

packages/sql-parser/base/parser.js

@@ -8,11 +8,17 @@ exports.parse = function (sql){
   return ap.ast;
 };
 
+exports.parseAll = function (sql) {
+  var ap = Parser.parse(sql);
+  return ap.asts;
+}
+
 exports.parseFromClause = function (sql) {
   return FromClauseParser.parse(sql)
 }
 
 module.exports = {
   parse: exports.parse,
-  parseFromClause: exports.parseFromClause
+  parseFromClause: exports.parseFromClause,
+  parseAll: exports.parseAll,
 }

packages/sql-parser/index.d.ts

@@ -65,16 +65,18 @@
 }
 
 start 
-  = &{ return true; } __ ast:(union_stmt / update_stmt / replace_insert_stmt / delete_stmt / create_table_stmt / alter_table_stmt / create_index_stmt) __ EOSQL? __ {
+  = &{ return true; } __ ast:ast __ tail: ((EOSQL __ start / EOSQL))* {
       return {
         ast   : ast,
+        asts  : [ast].concat(tail.map(v => v[2].ast))
       } 
     } 
     /ast:proc_stmts {
       return {
         ast : ast  
       }
     }
+ast = union_stmt / update_stmt / replace_insert_stmt / delete_stmt / create_table_stmt / alter_table_stmt / create_index_stmt
 
 union_stmt
   = head:select_stmt tail:(__ KW_UNION __ KW_ALL? __ select_stmt)* {

packages/sql-parser/index.js

@@ -12,3 +12,14 @@ describe('table name with double quotes', () => {
      expect(result).toMatchObject({ type: 'select' })
   })
 })
+
+
+describe('multiple sqls in the same file', () => {
+    const sql = `
+      SELECT "T1"."COL1" FROM "T1" WHERE "T1"."num" = 1;
+      SELECT "T1"."COL1" FROM "T1" WHERE "T1"."num" = 2;
+     `
+     const result = parse(sql)
+     expect(result).toBeDefined()
+     expect(result).toMatchObject({ type: 'select' })
+});

packages/sql-parser/parser.pegjs

@@ -1,4 +1,4 @@
-import { parse, NodeRange, AST, Node, BaseNode } from '@joe-re/sql-parser'
+import { parseAll, NodeRange, AST, Node, BaseNode } from '@joe-re/sql-parser'
 import log4js from 'log4js'
 import { Fixer, FixDescription, createFixer } from '../fixer'
 import { reservedWordCase } from './reservedWordCase'
@@ -80,8 +80,12 @@ export function execute(sql: string, config: Config): Diagnostic[] {
   registerRule(requireAsToRenameColumn, config, sql)
 
   try {
-    const ast = parse(sql)
-    return walk(ast)
+    const ast = parseAll(sql)
+    return ast
+      .map((v) => {
+        return walk(v)
+      })
+      .flat()
   } catch (e) {
     logger.debug(e)
     return []