sqlint 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8299d22b3799957a801442f25ecf60c1d3538f3
-  data.tar.gz: 7e9564d42eda301285008931947e05cecd399faf
+  metadata.gz: ca4703618f9528f3c18388c9b4942b4ff527b73e
+  data.tar.gz: f56f97f3498168c72e3265b9a2d9af8c01f28b8d
 SHA512:
-  metadata.gz: 6aaddf95c7506f3b00e436d888d9e11244e410b55947597b14e3ed56c08fea4ffae2f8edf25742cf51736389be24adc9f46286b6c5b918f779106618aa6acdfb
-  data.tar.gz: c6e5b3086494649f56859029f111ada4e58fee9588a425c3c11dd27d30891be230b5a1ade6ff9cac871d5176eb4a7fc1d141d280e46d0e1324dfcf4e278d71f5
+  metadata.gz: 440303275dca244c8c3d60458b5abe26fe524894663eb3557cb90350e9c41116bf55fd82b2ce43902f2fa1248aeaae32de91f406bac4fdce87a6c2614fafc946
+  data.tar.gz: 8f46e7850cd670876e9605233f90cbbf81158e44e48f7bcac4d39c7b114158a36bed810c75ddc5dbeebcb752110cf9b18ff64977bb3ebd225dadda95eb899efe

data/README.md

@@ -31,15 +31,18 @@ sqlint filename.sql
 
 Support for `sqlint` is provided for the following editors:
 
-- Emacs, via Flycheck ([submission pending](https://github.com/flycheck/flycheck/pull/691))
-- VIM, via Syntastic ([submission pending](https://github.com/scrooloose/syntastic/pull/1477))
+- Emacs, via [Flycheck](https://github.com/flycheck/flycheck)
+- VIM, via [Syntastic](https://github.com/scrooloose/syntastic)
 - SublimeText, via the SublimeLinter package ([submission pending](https://github.com/SublimeLinter/SublimeLinter3/issues/297))
 
 ### Authors
 
-This software was written by Steve Purcell and Kieran Trezona-le Comte
-with the support of our awesome employer
-[Powershop](http://www.powershop.co.nz/).
+This software was written by
+[Steve Purcell](https://github.com/purcell) and
+[Kieran Trezona-le Comte](https://github.com/trezona-lecomte) with the
+support of our awesome employer
+[Powershop](http://www.powershop.co.nz/), who have other cool stuff
+[here on Github](https://github.com/powershop).
 
 ### License and copyright
 

data/lib/sqlint/linter.rb

@@ -3,6 +3,8 @@ require 'pg_query'
 module SQLint
   class Linter
     Lint = Struct.new(:filename, :line, :column, :type, :message)
+    ParseState = Struct.new(:input, :offset)
+    END_PARSE = ParseState.new(nil, nil)
 
     def initialize(filename, input_stream)
       @input = input_stream.read
@@ -11,16 +13,46 @@ module SQLint
 
     def run
       [].tap do |results|
-        begin
-          PgQuery.parse(@input)
-        rescue PgQuery::ParseError => e
-          offset = e.location
-          lines_before_error = @input[0...(offset)].split("\n")
-          line_number = lines_before_error.size
-          column_number = lines_before_error.any? ? lines_before_error.last.size : 1
-          results << Lint.new(@filename, line_number, column_number, :error, e.message)
+        state = ParseState.new(@input, 0)
+        while state != END_PARSE
+          error, new_parse_state = parse_next_error(state)
+          results << error if error
+          state = new_parse_state
         end
       end
     end
+
+    private
+
+    def parse_next_error(parse_state)
+      begin
+        PgQuery.parse(parse_state.input)
+        [nil, END_PARSE]
+      rescue PgQuery::ParseError => e
+        offset = e.location + parse_state.offset
+        line_number, column_number = find_absolute_position(offset)
+        lint = Lint.new(@filename, line_number, column_number, :error, e.message)
+
+        input_from_error = parse_state.input[e.location..-1]
+        semicolon_pos = input_from_error.index(";") if input_from_error
+        [
+          lint,
+          if semicolon_pos
+            remaining_input = input_from_error[semicolon_pos+1..-1]
+            new_offset = offset + semicolon_pos + 1
+            ParseState.new(remaining_input, new_offset)
+          else
+            END_PARSE
+          end
+        ]
+      end
+    end
+
+    def find_absolute_position(offset)
+      lines_before_error = @input[0...(offset)].split("\n")
+      line_number = lines_before_error.size
+      column_number = lines_before_error.any? ? lines_before_error.last.size : 1
+      [line_number, column_number]
+    end
   end
 end

data/lib/sqlint/version.rb

@@ -1,3 +1,3 @@
 module SQLint
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlint
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Steve Purcell