piggly 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7b807efe5c5d12d4a91d3be46379b423094471e
-  data.tar.gz: 733371c4f0c66f954ed0992b2084b48795fa4f61
+  metadata.gz: a2b78c278ad31f77e5dbf4677a77e42f6a24a267
+  data.tar.gz: c9a87f1bca511331450caf12f26d48bd165d8744
 SHA512:
-  metadata.gz: 6d545575f7e1a105b61be250cf8dcfd48748792d473e9737036265979449159a4c5f1f1d5862426c9da8508e2bfb127e545db52a4d1a85203edb2bc76dfdfdcb
-  data.tar.gz: ee79b0de1bce8668ad3e0354d2d132a7bc6d1a8f29446efa16c5a60b96a39a3257634d7b93dfb3823313f2595d036529c881480fa2d226ebc8f5887ce1a33f3c
+  metadata.gz: 796cd9e88a976fd7fd5365f6a123168e254b4acf41a70c7de338cdf5f96c46c5d21fa0a51c3fb54a67d08089712a45eafedc1b776fea2dd289a4efb61b45dad4
+  data.tar.gz: 99fe5b35d5e9dc01c923b0f30cdc79a0ac4628b6be6883bb68cf5fb1e06b0b73d3fe4381c938f0f83d402352df4a36e6c07b851866c0e578e45037c1f2c93323

data/lib/piggly/parser/grammar.tt

@@ -234,7 +234,7 @@ grammar Piggly
     body:(kwRETURN ( tSpace? &';'
                    / tSpace kwNEXT tSpace expressionUntilSemiColon tSpace?
                    / tSpace kwQUERY tSpace expressionUntilSemiColon
-                   / expressionUntilSemiColon )) ';'
+                   / expressionUntilSemiColon )) ';' <Piggly::Parser::Nodes::Return>
   end
 
   rule stmtRaise
@@ -256,7 +256,7 @@ grammar Piggly
   end
 
   rule stmtGetDiag
-    kwGET tSpace kwSTACKED tSpace kwDIAGNOSTICS tSpace expressionUntilSemiColon ';' <Piggly::Parser::Nodes::Expression>
+    kwGET tSpace ( kwSTACKED tSpace )? kwDIAGNOSTICS tSpace expressionUntilSemiColon ';' <Piggly::Parser::Nodes::Expression>
   end
 
   rule stmtNull

data/lib/piggly/reporter/resources/sortable.js

@@ -169,7 +169,7 @@ sorttable = {
     for (var i=0; i<table.tBodies[0].rows.length; i++) {
       text = sorttable.getInnerText(table.tBodies[0].rows[i].cells[column]);
       if (text != '') {
-        if (text.match(/^-?[�$�]?[\d,.]+%?$/)) {
+        if (text.match(/^-?[$]?[\d,.]+%?$/)) {
           return sorttable.sort_numeric;
         }
         // check for a date: dd/mm/yyyy or dd/mm/yy 

data/lib/piggly/version.rb

@@ -2,7 +2,7 @@ module Piggly
   module VERSION
     MAJOR = 2
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     RELEASE_DATE = "2017-10-23"
   end

data/spec/issues/028_spec.rb

@@ -4,14 +4,14 @@ module Piggly
   describe "github issue #28" do
     include GrammarHelper
 
-    it "can parse the a GET DIAGNOSTICS expression" do
+    it "can parse a GET STACKED DIAGNOSTICS statement" 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
+    it "can parse a procedure with GET STACKED DIAGNOSTICS" do
       body = <<-SQL
       DECLARE
         text_var1 text;

data/spec/issues/036_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+module Piggly
+  describe "github issue #32" do
+    include GrammarHelper
+
+    it "can parse a GET DIAGNOSTICS statement" do
+      node = parse(:statement, "GET DIAGNOSTICS v_cnt = ROw_COUNT;")
+      node.should be_statement
+    end
+
+	it "can parse a procedure with GET DIAGNOSTICS" do
+      body = <<-SQL
+      DECLARE
+        v_cnt INTEGER;
+      BEGIN
+        INSERT INTO foo.foo_table(bar, barbar_fl, foofoo_fl, bazbaz_ts)
+          SELECT
+            a.zoorzoor_id,
+            b.zap_fl,
+            b.zip_fl,
+            current_timestamp
+          FROM unnest(p_baz) a
+            INNER JOIN foo.zimzam b
+              ON a.zoor_id = b.zoor_id
+        ON CONFLICT (bar)
+          DO UPDATE SET barbar_fl= excluded.barbar_fl, foofoo_fl= excluded.foofoo_fl, last_updt_ts=current_timestamp;
+        GET DIAGNOSTICS v_cnt = ROW_COUNT;
+        RAISE NOTICE Updated % bar stuffs', v_cnt;
+        RETURN v_cnt;
+      END;
+      SQL
+
+      node = parse(:start, body.strip.downcase)
+      node.count{|e| e.sql? }.should == 1
+      node.count{|e| Parser::Nodes::Raise === e }.should == 1
+      node.count{|e| Parser::Nodes::Return === e }.should == 1
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggly
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Kvle Putnam
@@ -136,6 +136,7 @@ files:
 - spec/issues/018_spec.rb
 - spec/issues/028_spec.rb
 - spec/issues/032_spec.rb
+- spec/issues/036_spec.rb
 - spec/spec_helper.rb
 - spec/spec_suite.rb
 homepage: http://github.com/kputnam/piggly