piggly-nsd 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 736495bc6e9ad8785b755afb2b3a834cd0dff2e62983b0397e4d6fdf6f0fe3af
-  data.tar.gz: 958489e0a1a542230ad57dc8748ef4a231e9c03cea1452c34246887e9789746f
+  metadata.gz: adbaaa6aae6c18867afc0b250fcd1cf24d521be698e318af2094e91c56cde27d
+  data.tar.gz: b12f902025d1b49e10c4844d2dfbdf920edb89b5a5512fb530a108b9fadc54d7
 SHA512:
-  metadata.gz: ba81b385db041ea25c62a0777838d84ed89a165e489d6d4ef3f60ea908902acad3ba2a186e3eb7325a7520f407eead2ae3e6121fd8f4429664a3a9f00a848b01
-  data.tar.gz: e076e78ce56f6e8e7ed238f7fa354dfe9799b2707520394e5635162f8029359c581bf5d055b53efd0c0739b58410c59ee5cb9e94c08b7dd600ecf64f478fb7d4
+  metadata.gz: 464088a04d5cfce256c45bfd69ba44112cd0fe5faa8de6736cae795205915a9c1e885112cf24d4883f3329d6688f64f9fdd00e92ee240dada167a07a7da1b2a0
+  data.tar.gz: b686c522d0f8cb75548b6765a9ed5aaf0f57aab0298691e4ee017987468ca3a6a2d37c95742620e661d5421a33f2211dd24ef9948a75ddecac2be07879f172ee

data/lib/piggly/dumper/qualified_type.rb

@@ -70,10 +70,10 @@ module Piggly
       end
 
       def quote
-        if @schema
-          '"' + @schema + '"."' + normalize(@name) + '"' + @array
+        if @schema.nil? || @schema == "" || @schema == "pg_catalog"
+          readable(normalize(@name)) + @array
         else
-          '"' + normalize(@name) + '"' + @array
+          '"' + @schema + '"."' + @name + '"' + @array
         end
       end
 

data/lib/piggly/dumper/reified_procedure.rb

@@ -11,7 +11,7 @@ module Piggly
         # Ensure source is UTF-8 encoded
         @source = source.to_s.force_encoding('UTF-8').strip
 
-        if type.name == "record" and type.schema == "pg_catalog" and arg_modes.include?("t")
+        if arg_modes.include?("t")
           prefix       = arg_modes.take_while{|m| m != "t" }.length
           type         = RecordType.new(arg_types[prefix..-1], arg_names[prefix..-1], arg_modes[prefix..-1], arg_defaults[prefix..-1])
           arg_modes    = arg_modes[0, prefix]

data/lib/piggly/parser/grammar.tt

@@ -271,7 +271,7 @@ grammar PigglyParser
   end
 
   rule varDeclaration
-    varDeclarationMisc / varDeclarationCursor
+    varDeclarationCursor / varDeclarationMisc
   end
 
   rule varDeclarationMisc
@@ -284,7 +284,7 @@ grammar PigglyParser
   end
 
   rule varDeclarationCursor
-    name:tIdentifier tSpace ( ( kwNO tSpace )? kwSCROLL tSpace )? kwCURSOR tSpace
+    name:tIdentifier tSpace ( ( kwNO tSpace )? kwSCROLL tSpace )? kwCURSOR tSpace?
       rval:expressionUntilSemiColon
     tSpace?
     ';' tSpace?
@@ -346,17 +346,17 @@ grammar PigglyParser
 
   rule expressionUntilThen
     head:tSpace? expr:( sqlCaseExpression / tString / skipWords / tSpace !kwTHEN / !tSpace !kwTHEN . )+
-    tail:tSpace &kwTHEN <Piggly::Parser::Nodes::Expression>
+    tail:tSpace? &kwTHEN <Piggly::Parser::Nodes::Expression>
   end
 
   rule expressionUntilWhen
     head:tSpace? expr:( sqlCaseExpression / tString / skipWords / tSpace !kwWHEN / !tSpace !kwWHEN . )+
-    tail:tSpace &kwWHEN <Piggly::Parser::Nodes::Expression>
+    tail:tSpace? &kwWHEN <Piggly::Parser::Nodes::Expression>
   end
 
   rule expressionUntilLoop
     head:tSpace? expr:( sqlCaseExpression / tString / skipWords / tSpace !kwLOOP / !tSpace !kwLOOP . )+
-    tail:tSpace &kwLOOP <Piggly::Parser::Nodes::Expression>
+    tail:tSpace? &kwLOOP <Piggly::Parser::Nodes::Expression>
   end
 
   rule sqlCaseExpression
@@ -366,7 +366,7 @@ grammar PigglyParser
   end
 
   rule skipWords
-    [a-z0-9_]+ <Piggly::Parser::Nodes::TextNode>
+    !keyword [a-z0-9_]+ ![a-z0-9_] <Piggly::Parser::Nodes::TextNode>
   end
 
   #############################################################################
@@ -495,6 +495,7 @@ grammar PigglyParser
     / 'create'
     / 'drop'
     / 'alter'
+    / 'analyze'
     / 'commit'
     / 'rollback'
     / 'copy'

data/lib/piggly/version.rb

@@ -2,9 +2,9 @@ module Piggly
   module VERSION
     MAJOR = 2
     MINOR = 3
-    TINY  = 5
+    TINY  = 6
 
-    RELEASE_DATE = "2026-05-21"
+    RELEASE_DATE = "2026-06-01"
   end
 
   class << VERSION

data/spec/examples/dumper/definition_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+module Piggly
+  module Dumper
+
+    describe SkeletonProcedure, "definition" do
+      def qname(schema, name)
+        QualifiedName.new(schema, name)
+      end
+
+      def qtype(*args)
+        QualifiedType.parse(*args)
+      end
+
+      it "quotes user-defined types but not built-in types" do
+        expect(qtype("character varying").quote).to eq("varchar")
+        expect(qtype("pg_catalog", "varchar").quote).to eq("varchar")
+        expect(qtype("bigint").quote).to eq("bigint")
+        expect(qtype("private", "mytype").quote).to eq('"private"."mytype"')
+      end
+
+      it "generates valid SQL for functions with table return columns" do
+        procedure = ReifiedProcedure.new(
+          "begin end;",
+          1,
+          qname("public", "f_test_function"),
+          false,
+          false,
+          true,
+          qtype("pg_catalog", "varchar"),
+          "volatile",
+          %w[in in in t],
+          %w[p_payment_session_id p_payment_type_start p_payment_type_end type_mnemo].map { |n| qname(nil, n) },
+          ["bigint", "character varying", "character varying", "character varying"].map { |t| qtype(t) },
+          [nil, nil, nil, nil]
+        )
+
+        sql = procedure.definition("begin end;")
+
+        expect(sql).to include('in "p_payment_session_id" bigint')
+        expect(sql).to include('in "p_payment_type_start" varchar')
+        expect(sql).to include('returns table ("type_mnemo" varchar)')
+        expect(sql).not_to include('t "type_mnemo"')
+        expect(sql).not_to include('"varchar"')
+      end
+    end
+
+  end
+end

data/spec/examples/dumper/procedure_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Piggly
   

data/spec/examples/grammar/statements/declaration_spec.rb

@@ -15,6 +15,18 @@ module Piggly
       it "allows an initial assignment" do
         node = parse(:stmtDeclare, "declare a text := 10;")
       end
+
+      it "parses parameterized cursor declarations" do
+        parse(:stmtDeclare, <<~SQL)
+          declare
+            c_lic_acc_value cursor(c_lic_acc_id bigint, c_date_old timestamp) for
+              select date_v, beg_val from public.t_table_value where link_lic_acc = c_lic_acc_id;
+        SQL
+      end
+
+      it "parses cursor declarations without space before parameter list" do
+        parse(:stmtDeclare, "declare c cursor(x int) for select 1;")
+      end
     end
 
   end

data/spec/examples/grammar/statements/if_spec.rb

@@ -62,6 +62,12 @@ module Piggly
           node.should be_statement
           node.count{|e| e.comment? }.should == 3
         end
+
+        it "allows then immediately after closing parenthesis" do
+          node, rest = parse_some(:statement, 'IF exists(select 1)then null; end if;')
+          node.should be_statement
+          rest.should == ''
+        end
       end
 
       describe "if .. then .. else .. end if" do

data/spec/examples/grammar/statements/sql_spec.rb

@@ -13,6 +13,14 @@ module Piggly
         rest.should == ''
       end
 
+      it "parses ANALYZE statements" do
+        node, rest = parse_some(:statement, 'ANALYZE tt_test;')
+        node.should be_statement
+        node.count{|e| e.sql? }.should == 1
+        node.find{|e| e.sql? }.source_text.should == 'ANALYZE tt_test;'
+        rest.should == ''
+      end
+
       it "parses MERGE statements" do
         node, rest = parse_some(:statement, <<-SQL.strip)
           MERGE INTO users u

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggly-nsd
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Kvle Putnam
@@ -111,6 +111,7 @@ files:
 - spec/examples/compiler/report_spec.rb
 - spec/examples/compiler/trace_spec.rb
 - spec/examples/config_spec.rb
+- spec/examples/dumper/definition_spec.rb
 - spec/examples/dumper/index_spec.rb
 - spec/examples/dumper/procedure_spec.rb
 - spec/examples/grammar/expression_spec.rb