getting closer to displaying correct error location when there are multiple statements in the input SQL. refs #2

Author: nwronski

CHANGELOG.md

@@ -2,10 +2,9 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased][unreleased]
-
-## [v0.8.1] - 2015-07-04
 ### Changed
 - forked `pegjs` repository as `nwronski/pegjs` to get the changes into `pegjs` core into version control so they are not accidentally overwritten
+- getting closer to displaying correct error location when there are multiple statements in the input SQL
 
 ## [v0.8.0] - 2015-07-04
 ### Added

demo/sqlite-parser-demo.js

@@ -20,7 +20,7 @@
     });
   }
   sqliteParser['NAME'] = 'sqlite-parser';
-  sqliteParser['VERSION'] = '0.8.1';
+  sqliteParser['VERSION'] = '0.8.2';
 
   module.exports = root.sqliteParser = sqliteParser;
 })(typeof self === 'object' ? self : global);

dist/sqlite-parser.js

@@ -30,7 +30,7 @@ module.exports = (function (util) {
          *       statement is reported when there is an error within a
          *       statement that follows it
          */
-        this.indentation -= 1;
+         this.indentation -= 1;
         break;
       case 'rule.fail':
         // remove failed leaf
@@ -43,22 +43,20 @@ module.exports = (function (util) {
   Tracer.prototype.smartError = function smartError(err) {
     var message, location, chain, chainDetail,
         lastIndent = 10000,
-        bestDescriptor = false;
+        bestDescriptor = false,
+        multiStatement = false;
 
-    chain = this.events.filter(function (e) {
-      // Only use nodes with a set description
-      return e.description != null && !/whitespace|(semi$)|(^[oe]$)/i.test(e.rule);
-    })
+    chain = this.events
     .reverse()
     .filter(function (e) {
-      if (e.indentation < lastIndent) {
-        // Keep this node and update last indentation
-        lastIndent = e.indentation;
-        return true;
-      } else {
-        // Prune this node from a previous match sequence
+      // Only use nodes with a set description
+      if (multiStatement) {
         return false;
+      } else if (/Statement$/i.test(e.description)) {
+        multiStatement = true;
+        return true;
       }
+      return e.description !== null && !/whitespace|(semi$)|(^[oe]$)/i.test(e.rule);
     });
 
     if (chain.length) {

index.js

@@ -2,7 +2,7 @@
   "name": "sqlite-parser",
   "description": "JavaScript implentation of SQLite 3 query parser",
   "author": "Code School (http://codeschool.com)",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "contributors": [
     "Nick Wronski <nick@javascript.com>"
   ],

lib/parser.js

@@ -1102,7 +1102,7 @@ stmt_fallback_types
   { return k; }
 
 /** {@link https://www.sqlite.org/lang_insert.html} */
-stmt_insert "INSERT Statement"
+stmt_insert
   = k:( insert_keyword ) o t:( insert_target ) o p:( insert_parts )
   {
     // TODO: Not final syntax!
@@ -1120,15 +1120,15 @@ insert_keyword
   = insert_keyword_ins
   / insert_keyword_repl
 
-insert_keyword_ins
+insert_keyword_ins "INSERT Statement"
   = a:( INSERT ) e m:( insert_keyword_mod )?
   {
     return util.extend({
       'action': util.key(a)
     }, m);
   }
 
-insert_keyword_repl
+insert_keyword_repl "REPLACE Statement"
   = a:( REPLACE ) e
   {
     return {
@@ -1560,7 +1560,7 @@ stmt_create "CREATE Statement"
   / create_view
   / create_virtual
 
-create_table "CREATE Table"
+create_table "CREATE TABLE Statement"
   = s:( CREATE ) e tmp:( create_core_tmp )? t:( TABLE ) e ne:( create_core_ine )?
     id:( id_table ) o r:( create_table_source )
   {
@@ -1975,7 +1975,7 @@ table_source_select
   }
 
 /* TODO: Left off here */
-create_index "CREATE Index"
+create_index "CREATE INDEX Statement"
   = s:( CREATE ) e u:( index_unique )? i:( INDEX ) e ne:( create_core_ine )?
     n:( id_index ) o o:( index_on ) w:( stmt_core_where )?
   {
@@ -2014,7 +2014,7 @@ index_on
  *  enforced on UPDATE, DELETE, and INSERT statements in the trigger_action.
  *  See {@link https://www.sqlite.org/lang_createtrigger.html}.
  */
-create_trigger "CREATE Trigger"
+create_trigger "CREATE TRIGGER Statement"
   = s:( CREATE ) e p:( create_core_tmp )? t:( TRIGGER ) e ne:( create_core_ine )?
     n:( id_trigger ) o cd:( trigger_conditions ) ( ON ) e o:( name_table ) o
     me:( trigger_foreach )? wh:( trigger_when )? a:( trigger_action )
@@ -2109,7 +2109,7 @@ action_loop_stmt
   = s:( stmt ) o c:( sym_semi )
   { return s; }
 
-create_view "CREATE View"
+create_view "CREATE VIEW Statement"
   = s:( CREATE ) e p:( create_core_tmp )? v:( VIEW ) e ne:( create_core_ine )?
     n:( id_view ) o r:( create_as_select )
   {
@@ -2135,7 +2135,7 @@ create_as_select
  *    as is allowed in the SQLite spec for virtual table module arguments.
  *    See {@link https://www.sqlite.org/lang_createvtab.html}.
  */
-create_virtual "CREATE Virtual Table"
+create_virtual "CREATE VIRTUAL TABLE Statement"
   = s:( CREATE ) e v:( VIRTUAL ) e t:( TABLE ) e ne:( create_core_ine )?
     n:( id_table ) e ( USING ) e m:( name_module ) o a:( virtual_args )?
   {

lib/tracer.js

@@ -30,7 +30,7 @@ module.exports = (function (util) {
          *       statement is reported when there is an error within a
          *       statement that follows it
          */
-        this.indentation -= 1;
+         this.indentation -= 1;
         break;
       case 'rule.fail':
         // remove failed leaf
@@ -43,22 +43,20 @@ module.exports = (function (util) {
   Tracer.prototype.smartError = function smartError(err) {
     var message, location, chain, chainDetail,
         lastIndent = 10000,
-        bestDescriptor = false;
+        bestDescriptor = false,
+        multiStatement = false;
 
-    chain = this.events.filter(function (e) {
-      // Only use nodes with a set description
-      return e.description != null && !/whitespace|(semi$)|(^[oe]$)/i.test(e.rule);
-    })
+    chain = this.events
     .reverse()
     .filter(function (e) {
-      if (e.indentation < lastIndent) {
-        // Keep this node and update last indentation
-        lastIndent = e.indentation;
-        return true;
-      } else {
-        // Prune this node from a previous match sequence
+      // Only use nodes with a set description
+      if (multiStatement) {
         return false;
+      } else if (/Statement$/i.test(e.description)) {
+        multiStatement = true;
+        return true;
       }
+      return e.description !== null && !/whitespace|(semi$)|(^[oe]$)/i.test(e.rule);
     });
 
     if (chain.length) {