Skip to content
Snippets Groups Projects
Commit 2fe6381b authored by Steve Purcell's avatar Steve Purcell
Browse files

Tidy up top-level script

parent b252a914
No related branches found
No related tags found
No related merge requests found
...@@ -5,8 +5,6 @@ require 'pg_query' ...@@ -5,8 +5,6 @@ require 'pg_query'
require 'sqlint' require 'sqlint'
require 'optparse' require 'optparse'
LIMIT = 1000
options = { limit: 1000 } options = { limit: 1000 }
optparse = OptionParser.new do |opts| optparse = OptionParser.new do |opts|
opts.banner = "Usage: #{File.basename($0)} [options] file.sql ..." opts.banner = "Usage: #{File.basename($0)} [options] file.sql ..."
...@@ -40,11 +38,7 @@ class String ...@@ -40,11 +38,7 @@ class String
end end
end end
saw_errors = false def display_lint(lint)
ARGV.each do |filename|
File.open(filename, 'r') do |file|
results = SQLint::Linter.new(filename, file).run.first(options[:limit])
results.each do |lint|
message_lines = lint.message.split("\n") message_lines = lint.message.split("\n")
puts [ puts [
lint.filename, lint.filename,
...@@ -55,9 +49,16 @@ ARGV.each do |filename| ...@@ -55,9 +49,16 @@ ARGV.each do |filename|
message_lines.each do |line| message_lines.each do |line|
puts " " + line.sanitise puts " " + line.sanitise
end end
end
saw_errors ||= (lint.type == :error) saw_errors = false
ARGV.each do |filename|
File.open(filename, 'r') do |file|
results = SQLint::Linter.new(filename, file).run.first(options[:limit])
results.each do |lint|
display_lint(lint)
end end
saw_errors ||= results.any? { |lint| lint.type == :error }
end end
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment