sqlint 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca4703618f9528f3c18388c9b4942b4ff527b73e
-  data.tar.gz: f56f97f3498168c72e3265b9a2d9af8c01f28b8d
+  metadata.gz: 2a659c0622ca330e784dfecef69f5c0545f79836
+  data.tar.gz: 14ad1e500274a2b00a98cb20ea3f58fe2eb2c5a4
 SHA512:
-  metadata.gz: 440303275dca244c8c3d60458b5abe26fe524894663eb3557cb90350e9c41116bf55fd82b2ce43902f2fa1248aeaae32de91f406bac4fdce87a6c2614fafc946
-  data.tar.gz: 8f46e7850cd670876e9605233f90cbbf81158e44e48f7bcac4d39c7b114158a36bed810c75ddc5dbeebcb752110cf9b18ff64977bb3ebd225dadda95eb899efe
+  metadata.gz: 52bfbfbfc45980d7398932b0098f152bd1e8ffa0a55e0acfa09480634553b58c0d63cbdd3490883b48ba4aa7202bee65252e0ff6cb7121e951d92183b3f8fb03
+  data.tar.gz: 8f30c0e45b775eafd0e062e655d2d8bfba4fe2002049c7c6e7ced55da7581a8adf63cc58801eab91f7a97083299bb00e30b78ab32649574a808abc272cd1f501

data/README.md

@@ -1,4 +1,6 @@
-[![Build Status](https://travis-ci.org/purcell/sqlint.png?branch=master)](https://travis-ci.org/purcell/sqlint)
+[![Build Status](https://travis-ci.org/purcell/sqlint.svg?branch=master)](https://travis-ci.org/purcell/sqlint)
+[ ![](https://img.shields.io/gem/v/sqlint.svg)](https://rubygems.org/gems/sqlint)
+[ ![](https://img.shields.io/gem/dt/sqlint.svg)](https://rubygems.org/gems/sqlint)
 
 ## SQLint - a simple SQL linter
 

data/TODO

@@ -0,0 +1,9 @@
+- [-] More input test cases?
+- [-] Handle any warnings returned by PgQuery.parse
+- [X] Limit number of warnings
+- [ ] Optionally connect to a live DB to check referenced table/column names are valid
+- [ ] Refactor and test the CLI front end
+- [ ] Support for other SQL dialects
+- [ ] JSON output
+- [ ] Huge files
+- [X] Maybe truncate long 'at or near "blah"' strings

data/bin/sqlint

@@ -1,22 +1,33 @@
 #!/usr/bin/env ruby
 
-# What if 1000+ errors => --limit
-# Split on "; -- ..."
-
-
-
 $LOAD_PATH.unshift(File.dirname(File.realpath(__FILE__)) + '/../lib')
 require 'pg_query'
 require 'sqlint'
+require 'optparse'
 
-if ARGV.include?("--version")
-  puts SQLint::VERSION
-  exit 0
-end
+LIMIT = 1000
 
-if ARGV.empty? || ARGV.include?("--help") || ARGV.include?("-h")
-  puts "Usage: sqlint file.sql ..."
-  exit 0
+options = { limit: 1000 }
+optparse = OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename($0)} [options] file.sql ..."
+  opts.separator ""
+  opts.separator "Options:"
+  opts.on("--limit=N", Integer, "Limit checking to N errors") do |n|
+    options[:limit] = n
+  end
+  opts.on_tail("-h", "--help", "Print this help") do
+    puts opts
+    exit 0
+  end
+  opts.on_tail("-v", "--version", "Display the version") do
+    puts SQLint::VERSION
+    exit 0
+  end
+end
+optparse.parse!(ARGV)
+if ARGV.empty?
+  puts optparse
+  exit 1
 end
 
 ERROR_TYPES = {error: "ERROR", warning: "WARNING"}
@@ -32,7 +43,7 @@ end
 saw_errors = false
 ARGV.each do |filename|
   File.open(filename, 'r') do |file|
-    results = SQLint::Linter.new(filename, file).run
+    results = SQLint::Linter.new(filename, file).run.first(options[:limit])
     results.each do |lint|
       message_lines = lint.message.split("\n")
       puts [

data/lib/sqlint/linter.rb

@@ -12,7 +12,7 @@ module SQLint
     end
 
     def run
-      [].tap do |results|
+      Enumerator.new do |results|
         state = ParseState.new(@input, 0)
         while state != END_PARSE
           error, new_parse_state = parse_next_error(state)
@@ -31,7 +31,7 @@ module SQLint
       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)
+        lint = Lint.new(@filename, line_number, column_number, :error, clean_message(e.message))
 
         input_from_error = parse_state.input[e.location..-1]
         semicolon_pos = input_from_error.index(";") if input_from_error
@@ -54,5 +54,9 @@ module SQLint
       column_number = lines_before_error.any? ? lines_before_error.last.size : 1
       [line_number, column_number]
     end
+
+    def clean_message(message)
+      message.gsub(/(?<=at or near ")(.*)(?=")/) { |match| match[0..49] }
+    end
   end
 end

data/lib/sqlint/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlint
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Steve Purcell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_query
@@ -80,6 +80,7 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - README.md
+- TODO
 - bin/sqlint
 - lib/sqlint.rb
 - lib/sqlint/linter.rb