piggly 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bc3e3b06dfb2ce02fc63e702216f7144165c2a0
-  data.tar.gz: 15a2d1da931923920ffce34f726096c3f31e8492
+  metadata.gz: f16c8c0dbea51654e23f87e09524076da758fb8e
+  data.tar.gz: 99c21d733eb0fc50e1334e760f7601141eac4c3a
 SHA512:
-  metadata.gz: 8409f7c8adde74c01dfaeb3dcf0e1a6df10b5e8d7552701d38586f938d47e9727457c34a3b2a539f1ad54ceb4e5450909bddfc3f4b43485a2094fd9dc045f97c
-  data.tar.gz: b4d409e5ab4f45112f27444720fa56ce6e034e8c9244c466a2f249fcf0cb3032269287ca8eb48927c01245e7e1e62bf42a0b15a32f3df408ed3278a962eeb1dc
+  metadata.gz: 75479a4b5b69f804d2d7dd54272f65784301821a1088a3e969398610e8f4a56f114b48dca7606d34605305d4f440af669a9a7cfecf796a2c4aa59ad3fafff981
+  data.tar.gz: fbff8e9856834ad14593596fd5ea76ddfaf49ee9c8625afbb4257450b0e04e1ca4699c9b24e76de20c78283d91204cc25d5666244e6900d498b228eb1f389956

data/lib/piggly/command/base.rb

@@ -10,7 +10,7 @@ module Piggly
         cmd, argv = command(argv)
 
         if cmd.nil?
-          abort "usage: #{$0} {test|report|trace|untrace} --help"
+          abort "usage: #{$0} {report|trace|untrace} --help"
         else
           cmd.main(argv)
         end
@@ -25,7 +25,6 @@ module Piggly
 
         case head.downcase
         when "report";  [Report,  tail]
-        when "test";    [Test,    tail]
         when "trace";   [Trace,   tail]
         when "untrace"; [Untrace, tail]
         end
@@ -68,18 +67,26 @@ module Piggly
         else
           head, _ = config.filters
 
-          start =
-            case head.first
-            when :+; []
-            when :-; index.procedures
-            end
+          start = index.procedures
 
           config.filters.inject(start) do |s, pair|
             case pair.first
-            when :+
-              s | index.procedures.select(&pair.last)
-            when :-
-              s.reject(&pair.last)
+              when :+
+                puts "Selecting procedures"
+                o = s.select(&pair.last)
+                puts "Selected #{ o.count} procedures"
+                puts "Selected:"
+                o.each do |x| puts x.name end
+		puts "---"
+                o
+              when :-
+                puts "Rejecting procedures"
+                o = s.reject(&pair.last)
+                puts "Rejected #{s.count - o.count} procedures"
+                puts "Rejected:"
+                ((o-s)|(s-o)).each do |x| puts x.name end
+                puts "---"
+                o
             end
           end
         end
@@ -110,11 +117,11 @@ module Piggly
       end
 
       def o_version(config)
-        lambda { puts "piggly #{VERSION} #{VERSION::RELEASE_DATE}"; exit! }
+        lambda {|x| puts "piggly #{VERSION} #{VERSION::RELEASE_DATE}"; exit! }
       end
 
       def o_dry_run(config)
-        lambda { config.dry_run = true }
+        lambda {|x| config.dry_run = true }
       end
 
       def o_select(config)

data/lib/piggly/command.rb

@@ -2,7 +2,6 @@ module Piggly
   module Command
     autoload :Base,     "piggly/command/base"
     autoload :Report,   "piggly/command/report"
-    autoload :Test,     "piggly/command/test"
     autoload :Trace,    "piggly/command/trace"
     autoload :Untrace,  "piggly/command/untrace"
   end

data/lib/piggly/compiler/trace_compiler.rb

@@ -22,6 +22,7 @@ module Piggly
         cache = CacheDir.new(cache_path(procedure.source_path(@config)))
 
         if stale?(procedure)
+          begin
           $stdout.puts "Compiling #{procedure.name}"
           tree = Parser.parse(IO.read(procedure.source_path(@config)))
           tree = tree.force! if tree.respond_to?(:thunk?)
@@ -30,6 +31,17 @@ module Piggly
           code = traverse(tree, procedure.oid, tags)
 
           cache.replace(:tree => tree, :code => code, :tags => tags)
+          rescue RuntimeError => e
+            $stdout.puts <<-EXMSG
+            ****
+            Error compiling procedure #{procedure.name}
+            Source: #{procedure.source_path(@config)}
+            Exception Message:
+            #{e.message}
+            ****
+            EXMSG
+          end
+
         end
 
         cache
@@ -49,10 +61,10 @@ module Piggly
             # IF(test) becomes IF(piggly_cond(TAG, test)) instead of IFpiggly_cond(TAG, (test))
             pre, cond = node.cond.expr.text_value.match(/\A(\(?[\t\n\r ]*)(.+)\z/m).captures
             node.cond.source_text = ""
-            
+
             tags << node.cond.tag(oid)
 
-            node.condStub.source_text  = "#{pre}piggly_cond($PIGGLY$#{node.cond.tag_id}$PIGGLY$, (#{cond}))"
+            node.condStub.source_text  = "#{pre}public.piggly_cond($PIGGLY$#{node.cond.tag_id}$PIGGLY$, (#{cond}))"
             node.condStub.source_text << traverse(node.cond.tail, oid, tags) # preserve trailing whitespace
           end
 
@@ -63,17 +75,17 @@ module Piggly
 
               # Hack to simulate a loop conditional statement in stmtForLoop and stmtLoop.
               # signal condition is true when body is executed, and false when exit stub is reached
-              node.bodyStub.source_text  = "perform piggly_cond($PIGGLY$#{node.cond.tag_id}$PIGGLY$, true);#{node.indent(:bodySpace)}"
-              node.bodyStub.source_text << "perform piggly_branch($PIGGLY$#{node.body.tag_id}$PIGGLY$);#{node.indent(:bodySpace)}"
+              node.bodyStub.source_text  = "perform public.piggly_cond($PIGGLY$#{node.cond.tag_id}$PIGGLY$, true);#{node.indent(:bodySpace)}"
+              node.bodyStub.source_text << "perform public.piggly_branch($PIGGLY$#{node.body.tag_id}$PIGGLY$);#{node.indent(:bodySpace)}"
 
               if node.respond_to?(:doneStub)
                 # Signal the end of an iteration was reached
-                node.doneStub.source_text  = "#{node.indent(:bodySpace)}perform piggly_signal($PIGGLY$#{node.cond.tag_id}$PIGGLY$, $PIGGLY$@$PIGGLY$);"
+                node.doneStub.source_text  = "#{node.indent(:bodySpace)}perform public.piggly_signal($PIGGLY$#{node.cond.tag_id}$PIGGLY$, $PIGGLY$@$PIGGLY$);"
                 node.doneStub.source_text << node.body.indent
               end
 
               # Signal the loop terminated
-              node.exitStub.source_text  = "\n#{node.indent}perform piggly_cond($PIGGLY$#{node.cond.tag_id}$PIGGLY$, false);"
+              node.exitStub.source_text  = "\n#{node.indent}perform public.piggly_cond($PIGGLY$#{node.cond.tag_id}$PIGGLY$, false);"
             elsif node.respond_to?(:body)
               # Unconditional branches (or blocks)
               #   BEGIN ... END;
@@ -81,7 +93,7 @@ module Piggly
               #   CONTINUE label;
               #   EXIT label;
               tags << node.body.tag(oid)
-              node.bodyStub.source_text = "perform piggly_branch($PIGGLY$#{node.body.tag_id}$PIGGLY$);#{node.indent(:bodySpace)}"
+              node.bodyStub.source_text = "perform public.piggly_branch($PIGGLY$#{node.body.tag_id}$PIGGLY$);#{node.indent(:bodySpace)}"
             end
           end
 

data/lib/piggly/dumper/qualified_type.rb

@@ -4,27 +4,55 @@ module Piggly
     class QualifiedType
       attr_reader :schema, :name
 
-      def initialize(schema, name)
-        @schema, @name = schema, normalize(name)
+      def self.parse(name, rest = nil)
+        if rest.to_s == ""
+          schema = nil
+        else
+          schema = name
+          name   = rest
+        end
+
+        case name
+        when /(.*)\[\]$/
+          name  = $1
+          array = "[]"
+        else
+          array = ""
+        end
+
+        if schema.to_s == ""
+          fst, snd = name.split(".", 2)
+          if snd.nil?
+            new(nil, fst, array)
+          else
+            new(fst, snd, array)
+          end
+        else
+          new(schema, name, array)
+        end
+      end
+
+      def initialize(schema, name, array)
+        @schema, @name, @array = schema, name, array
       end
 
       def shorten
-        self.class.new(nil, @name)
+        self.class.new(nil, @name, @array)
       end
 
       def quote
         if @schema
-          '"' + @schema + '"."' + @name + '"'
+          '"' + @schema + '"."' + @name + '"' + @array
         else
-          '"' + @name + '"'
+          '"' + @name + '"' + @array
         end
       end
 
       def to_s
         if @schema and !%w[public pg_catalog].include?(@schema)
-          @schema + "." + readable(@name)
+          @schema + "." + readable(@name) + @array
         else
-          readable(@name)
+          readable(@name) + @array
         end
       end
 
@@ -42,7 +70,6 @@ module Piggly
         # group by ret.typname, format_type(ret.oid, null)
         # order by format_type(ret.oid, null);
         case name
-        when /(.*)\[\]/                     then "_#{normalize($1)}"
         when '"any"'                        then "any"
         when "bigint"                       then "int8"
         when "bit varying"                  then "varbit"

data/lib/piggly/dumper/reified_procedure.rb

@@ -63,10 +63,11 @@ module Piggly
       end
 
       def defaults(exprs, count, total)
-        exprs = exprs.split(", ")
+        exprs = if exprs.nil? then [] else exprs.split(", ") end
+
         nreqd = total - count
 
-        if nreqd > 0 and exprs.length == count
+        if nreqd >= 0 and exprs.length == count
           Array.new(nreqd) + exprs
         else
           raise "Couldn't parse default arguments"
@@ -125,17 +126,25 @@ module Piggly
       def from_hash(hash)
         new(hash["source"],
             hash["oid"],
-            QualifiedName.new(hash["nschema"], hash["name"]),
+            QualifiedName.new(hash["nschema"].to_s, hash["name"].to_s),
             hash["strict"] == "t",
             hash["secdef"] == "t",
             hash["setof"]  == "t",
-            QualifiedType.new(hash["tschema"], hash["type"]),
+            QualifiedType.parse(hash["tschema"].to_s, hash["type"].to_s),
             volatility(hash["volatility"]),
-            hash["arg_modes"].to_s.split(",").map{|x| mode(x.strip) },
+            coalesce(hash["arg_modes"].to_s.split(",").map{|x| mode(x.strip) }, ["in"]*hash["arg_count"].to_i),
             hash["arg_names"].to_s.split(",").map{|x| QualifiedName.new(nil, x.strip) },
-            hash["arg_types"].to_s.split(",").map{|x| QualifiedType.new(nil, x.strip) },
+            hash["arg_types"].to_s.split(",").map{|x| QualifiedType.parse(x.strip) },
             defaults(hash["arg_defaults"], hash["arg_defaults_count"].to_i, hash["arg_count"].to_i))
       end
+
+      def coalesce(value, default)
+        if [nil, "", []].include?(value)
+          default
+        else
+          value
+        end
+      end
     end
 
   end

data/lib/piggly/parser/grammar.tt

@@ -256,9 +256,7 @@ grammar Piggly
   end
 
   rule stmtGetDiag
-    kwGET tSpace
-    kwPERFORM tSpace
-    notImplemented
+    kwGET tSpace kwSTACKED tSpace kwDIAGNOSTICS tSpace expressionUntilSemiColon ';' <Piggly::Parser::Nodes::Expression>
   end
 
   rule stmtNull
@@ -482,7 +480,8 @@ grammar Piggly
     / 'create'
     / 'set'
     / 'start'
-    / 'notify' ) ![a-z0-9] <Piggly::Parser::Nodes::TKeyword>
+    / 'notify'
+    / 'with' ) ![a-z0-9] <Piggly::Parser::Nodes::TKeyword>
   end
 
   rule keyword
@@ -692,6 +691,10 @@ grammar Piggly
     'scroll' ![a-z0-9_] <Piggly::Parser::Nodes::TKeyword>
   end
 
+  rule kwSTACKED
+    'stacked' ![a-z0-9_] <Piggly::Parser::Nodes::TKeyword>
+  end
+
   rule kwSTRICT
     'strict' ![a-z0-9_] <Piggly::Parser::Nodes::TKeyword>
   end

data/lib/piggly/profile.rb

@@ -99,7 +99,7 @@ module Piggly
         if m = pattern.match(message)
           ping(m.captures[0], m.captures[1])
         else
-          stderr.puts(message)
+          stderr.puts("unknown trace: #{message}")
         end
       end
     end

data/lib/piggly/version.rb

@@ -1,10 +1,10 @@
 module Piggly
   module VERSION
     MAJOR = 2
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
 
-    RELEASE_DATE = "2016-05-03"
+    RELEASE_DATE = "2017-09-07"
   end
 
   class << VERSION

data/spec/028_spec.rb

@@ -0,0 +1,48 @@
+require "spec_helper"
+
+module Piggly
+  describe "github issue #28" do
+    include GrammarHelper
+
+    it "can parse the a GET DIAGNOSTICS expression" do
+      body = 'GET STACKED DIAGNOSTICS text_var1 = MESSAGE_TEXT, text_var2 = PG_EXCEPTION_DETAIL, text_var3 = PG_EXCEPTION_HINT;'
+
+      node = parse(:statement, body)
+      node.should be_statement
+    end
+
+    it "can parse a procedure with GET DIAGNOSTICS" do
+      body = <<-SQL
+      DECLARE
+        text_var1 text;
+        text_var2 text;
+        text_var3 text;
+      BEGIN
+        RETURN 1/0;
+      EXCEPTION WHEN SQLSTATE '22012' THEN
+        GET STACKED DIAGNOSTICS text_var1 = MESSAGE_TEXT,
+                                text_var2 = PG_EXCEPTION_DETAIL,
+                                text_var3 = PG_EXCEPTION_HINT;
+      END
+      SQL
+
+      node = parse(:start, body.strip)
+      node.count{|e| e.branch? }.should == 1 # catch
+      node.find{|e| e.branch? }.body.source_text.strip.should =~ /^GET.+HINT;/m
+    end
+
+    it "can parse WITH <> AS <> SELECT <> SQL query" do
+      body = <<-SQL
+      DECLARE
+      BEGIN
+        WITH n AS (SELECT first_name FROM users where id > 1000)
+          SELECT * FROM people WHERE people.first_name = n.first_name;
+        RETURN 1;
+      END
+      SQL
+
+      node = parse(:start, body.strip.downcase)
+      node.count{|e| e.sql? }.should == 1
+    end
+  end
+end

data/spec/examples/profile_spec.rb

@@ -44,7 +44,7 @@ describe Profile do
     context "when message doesn't match PATTERN" do
       it "prints the message to stderr" do
         message = "WARNING:  Parameter was NULL and I don't like it!"
-        @stderr.should_receive(:puts).with(message)
+        @stderr.should_receive(:puts).with("unknown trace: #{message}")
         @callback.call(message)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piggly
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Kvle Putnam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -52,7 +52,6 @@ files:
 - lib/piggly/command.rb
 - lib/piggly/command/base.rb
 - lib/piggly/command/report.rb
-- lib/piggly/command/test.rb
 - lib/piggly/command/trace.rb
 - lib/piggly/command/untrace.rb
 - lib/piggly/compiler.rb
@@ -91,6 +90,7 @@ files:
 - lib/piggly/util/process_queue.rb
 - lib/piggly/util/thunk.rb
 - lib/piggly/version.rb
+- spec/028_spec.rb
 - spec/examples/compiler/cacheable_spec.rb
 - spec/examples/compiler/report_spec.rb
 - spec/examples/compiler/trace_spec.rb
@@ -157,8 +157,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: PL/pgSQL code coverage tool
 test_files: []
+has_rdoc: false

data/lib/piggly/command/test.rb

@@ -1,157 +0,0 @@
-module Piggly
-  module Command
-
-    #
-    # This command handles all the setup and teardown for running Ruby tests, that can
-    # otherwise be accomplished in a more manual fashion, using the other commands. It
-    # assumes that the test files will automatically establish a connection to the correct
-    # database when they are loaded (this is the case for Rails).
-    #
-    module Test
-      class << self
-
-        def main(argv)
-          benchmark do
-            tests, filters = parse_options(argv)
-            profile = Profile.new
-
-            # don't let rspec get these when loading spec files
-            ARGV.clear
-
-            load_tests(tests)
-            Command.connect_to_database
-
-            procedures = dump_procedures(filters)
-
-            if procedures.empty?
-              abort "No stored procedures in the database#{' matched your criteria' if filters.any?}"
-            end
-
-            result =
-              begin
-                trace(procedures)
-                clear_coverage
-                execute_tests
-              ensure
-                untrace(procedures)
-              end
-
-            create_index(procedures)
-            create_reports(procedures)
-            store_coverage
-
-            exit! result # avoid running tests again
-          end
-        end
-
-      private
-
-        def benchmark
-          start = Time.now
-          value = yield
-          puts " > Completed in #{'%0.2f' % (Time.now - start)} seconds"
-          return value
-        end
-
-        #
-        # Parses command-line options
-        #
-        def parse_options(argv)
-          filters = []
-
-          opts = OptionParser.new do |opts|
-            opts.on("-I", "--include PATHS", "Prepend paths to $LOAD_PATH (colon separated list)", &Command.method(:opt_include_path))
-            opts.on("-o", "--report-root PATH", "Report output directory", &Command.method(:opt_report_root))
-            opts.on("-c", "--cache-root PATH", "Local cache directory", &Command.method(:opt_cache_root))
-
-            opts.on("-n", "--name PATTERN", "Trace stored procedures matching PATTERN") do |opt|
-              if m = opt.match(%r{^/(.+)/$})
-                filters << lambda{|p| p.name.match(m.captures.first) }
-              else
-                filters << lambda{|p| p.name === opt }
-              end
-            end
-       
-            opts.on("-a", "--aggregate", "Aggregate data from the previous run", &Command.method(:opt_aggregate))
-            opts.on("-V", "--version", "Show version", &Command.method(:opt_version))
-            opts.on("-h", "--help", "Show this message") do
-              puts opts
-              exit! 0
-            end
-          end
-
-          begin
-            opts.parse! argv
-            raise OptionParser::MissingArgument, "no tests specified" if argv.empty?
-          rescue OptionParser::InvalidOption,
-                 OptionParser::InvalidArgument,
-                 OptionParser::MissingArgument
-            puts opts
-            puts
-            puts $!
-
-            exit! 1
-          end
-
-          test_paths = argv.map{|p| Dir[p] }.flatten.sort
-
-          return test_paths, filters
-        end
-
-        def load_tests(tests)
-          puts "Loading #{tests.size} test files"
-          benchmark { tests.each{|file| load file }}
-        end
-
-        #
-        # Writes all stored procedures in the database to disk
-        #
-        def dump_procedures(filters)
-          Command::Trace.dump_procedures(filters)
-        end
-
-        #
-        # Compiles all the stored procedures on disk and installs them
-        #
-        def trace(procedures)
-          benchmark { Command::Trace.trace(procedures) }
-        end
-
-        def clear_coverage
-          Command::Report.clear_coverage
-        end
-
-        def execute_tests
-          if defined? ::Test::Unit::AutoRunner
-            ::Test::Unit::AutoRunner.run
-          elsif defined? ::RSpec::Core
-            ::Rspec::Core::Runner.run(ARGV, $stderr, $stdout)
-          elsif defined? ::Spec::Runner
-            ::Spec::Runner.run
-          elsif defined? ::MiniTest::Unit
-            ::MiniTest::Unit.new.run(ARGV)
-          else
-            raise "Neither Test::Unit, MiniTest, nor RSpec were detected"
-          end
-        end
-
-        def store_coverage(profile)
-          benchmark { Command::Report.store_coverage(profile) }
-        end
-
-        def untrace(procedures)
-          benchmark { Command::Untrace.untrace(procedures) }
-        end
-
-        def create_index(procedures, profile)
-          benchmark { Command::Report.create_index(procedures, profile) }
-        end
-
-        def create_reports(procedures, profile)
-          benchmark { Command::Report.create_reports(procedures, profile) }
-        end
-
-      end
-    end
-  end
-end