pg_examiner 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5643afd2534a1e85ecb2508240f121250c781287
-  data.tar.gz: cc9c1a56805634ea8d72b0ab2225b3d48fae0c21
+  metadata.gz: 36c51dbbc8e2fccfd5eee408216749e98c20086d
+  data.tar.gz: 373bfeb979ed1012d4a05daf1dd5d4720b8c8a65
 SHA512:
-  metadata.gz: 8b7898f913fef164ab2b0394efb15890a3bfcd3bd2c7f56cdc588a7ae1e8b18445c90eb0d548ea71c95b410b4b0041435bd864ca53b59a81d294c12d06658884
-  data.tar.gz: 651a2956ad12e1355875dee49a59cbaa75076ce6f087ff11fddcb316f74a753bdf9bfc35075fba7e8a9017069b763298dc2e8c329b2f3371ff0f92c69ea306f2
+  metadata.gz: 982b849a8951bf7f9b783cf6ccb9e29d78d55c52a8d0158ec0f15dd474a1986a43a2b88931e0aff1a80915cb7683d82fd1e71b09c192374bb38c8a4650d5aa9c
+  data.tar.gz: 79cb8766ad4867ea4170dc6e5445ed86f849bba61e900982800a4a4355aa600fae7779f7c7176190fa3481375b649db028d4a175b1b79eb81cd466cbdb3dba0b

data/lib/pg_examiner/result/function.rb

@@ -3,11 +3,12 @@
 module PGExaminer
   class Result
     class Function < Item
+      EXCESS_WHITESPACE_REGEX = /\s+/.freeze
+
       def diffable_attrs
         {
           "name"        => "name",
           "proargmodes" => "argument modes",
-          "definition"  => "function definition",
         }
       end
 
@@ -16,9 +17,16 @@ module PGExaminer
           "argument_types" => "argument types",
           "return_type"    => "return type",
           "language"       => "language",
+          "definition"     => "function definition",
         }
       end
 
+      def definition
+        s = @row['definition'].strip
+        s.gsub!(EXCESS_WHITESPACE_REGEX, ' ')
+        s
+      end
+
       def argument_types
         @argument_types ||= @row['proargtypes'].split.map do |oid|
           result.pg_type.find{|t| t['oid'] == oid}['name']

data/lib/pg_examiner/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PGExaminer
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/function_spec.rb

@@ -76,8 +76,8 @@ describe PGExaminer do
     b.should_not == d
     c.should_not == d
 
-    a.diff(b).should == {"schemas"=>{"public"=>{"functions"=>{"add"=>{"function definition"=>{"CREATE OR REPLACE FUNCTION public.add(one integer, two integer)\n RETURNS integer\n LANGUAGE sql\nAS $function$\n        SELECT one + two\n      $function$\n"=>"CREATE OR REPLACE FUNCTION public.add(one integer, two integer, three integer)\n RETURNS integer\n LANGUAGE sql\nAS $function$\n        SELECT one + two\n      $function$\n"}, "argument types"=>{["int4", "int4"]=>["int4", "int4", "int4"]}}}}}}
-    a.diff(c).should == {"schemas"=>{"public"=>{"functions"=>{"add"=>{"function definition"=>{"CREATE OR REPLACE FUNCTION public.add(one integer, two integer)\n RETURNS integer\n LANGUAGE sql\nAS $function$\n        SELECT one + two\n      $function$\n"=>"CREATE OR REPLACE FUNCTION public.add(one integer, two integer, three integer[])\n RETURNS integer\n LANGUAGE sql\nAS $function$\n        SELECT one + two\n      $function$\n"}, "argument types"=>{["int4", "int4"]=>["int4", "int4", "_int4"]}}}}}}
+    a.diff(b).should == {"schemas"=>{"public"=>{"functions"=>{"add"=>{"function definition"=>{"CREATE OR REPLACE FUNCTION public.add(one integer, two integer) RETURNS integer LANGUAGE sql AS $function$ SELECT one + two $function$"=>"CREATE OR REPLACE FUNCTION public.add(one integer, two integer, three integer) RETURNS integer LANGUAGE sql AS $function$ SELECT one + two $function$"}, "argument types"=>{["int4", "int4"]=>["int4", "int4", "int4"]}}}}}}
+    a.diff(c).should == {"schemas"=>{"public"=>{"functions"=>{"add"=>{"function definition"=>{"CREATE OR REPLACE FUNCTION public.add(one integer, two integer) RETURNS integer LANGUAGE sql AS $function$ SELECT one + two $function$"=>"CREATE OR REPLACE FUNCTION public.add(one integer, two integer, three integer[]) RETURNS integer LANGUAGE sql AS $function$ SELECT one + two $function$"}, "argument types"=>{["int4", "int4"]=>["int4", "int4", "_int4"]}}}}}}
   end
 
   it "should be able to differentiate between functions by their argument defaults" do
@@ -255,4 +255,44 @@ describe PGExaminer do
     a.should_not == c
     a.should_not == d
   end
+
+  it "should ignore whitespace in function definitions" do
+    a = examine <<-SQL_FUNCTION
+      CREATE FUNCTION add(one integer, two integer) RETURNS integer
+      AS $$
+        SELECT one + two
+      $$
+      LANGUAGE SQL;
+    SQL_FUNCTION
+
+    b = examine <<-SQL_FUNCTION
+    CREATE FUNCTION add(one integer, two integer) RETURNS integer
+    AS $$
+      SELECT one + two
+    $$
+    LANGUAGE SQL;
+    SQL_FUNCTION
+
+    c = examine <<-SQL_FUNCTION
+  CREATE FUNCTION add(one integer, two integer) RETURNS integer
+  AS $$
+    SELECT one + two
+  $$
+  LANGUAGE SQL;
+    SQL_FUNCTION
+
+    d = examine <<-SQL_FUNCTION
+CREATE FUNCTION add(one integer, two integer) RETURNS integer
+AS $$
+  SELECT one + two
+
+
+$$
+LANGUAGE SQL;
+    SQL_FUNCTION
+
+    a.should == b
+    a.should == c
+    a.should == d
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_examiner
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg