Supress 'pg_catalog' from QualifiedName#to_s. Fix #19

kputnam · Aug 13, 2011 · 6d6edcb · 6d6edcb
1 parent ed4f528
commit 6d6edcb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/piggly/dumper/qualified_name.rb b/lib/piggly/dumper/qualified_name.rb
@@ -9,7 +9,7 @@ def initialize(name, *names)
       end
 
       def shorten
-        self.class.new(@names.last)
+        self.class.new(*@names.slice(1..-1))
       end
 
       # @return [String]
@@ -23,7 +23,11 @@ def schema
 
       # @return [String]
       def to_s
-        @names.join(".")
+        if schema == "pg_catalog"
+          @names.slice(1..-1).join(".")
+        else
+          @names.join(".")
+        end
       end
 
       def ==(qn)

diff --git a/lib/piggly/dumper/skeleton_procedure.rb b/lib/piggly/dumper/skeleton_procedure.rb
@@ -21,7 +21,7 @@ def initialize(oid, name, strict, secdef, setof, type, volatility, arg_modes, ar
       # @return [String]
       def arguments
         @arg_types.zip(@arg_names, @arg_modes).map do |type, name, mode|
-          "#{mode + " " if mode}#{name.quote + " " if name}#{type.shorten}"
+          "#{mode + " " if mode}#{name.quote + " " if name}#{type}"
         end.join(", ")
       end