Pg12

dumbo.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rake"
   spec.add_dependency 'erubis'
-  spec.add_dependency 'rspec', '~> 3.0.0'
+  spec.add_dependency 'rspec'
   spec.add_dependency 'activerecord'
-  spec.add_dependency 'pg', '> 0.17'
+  spec.add_dependency 'pg'
 
   spec.add_dependency 'thor'
   spec.add_dependency 'activesupport'
 
-  spec.add_dependency "bundler", "~> 1.5"
+  spec.add_dependency "bundler"
 end

lib/dumbo/dependency_resolver.rb

@@ -22,7 +22,8 @@ def initialize(file_list)
     end
 
     def resolve
-      list = dependency_list.sort { |a, b| a.last.size <=> b.last.size }
+      # sort by dependency size and name
+      list = dependency_list.sort_by {|a| [ a.last.size, a.first ]} 
       resolve_list(list)
     end
 

lib/dumbo/function.rb

@@ -45,12 +45,16 @@ def load_attributes
           pg_catalog.pg_get_function_result(p.oid) as result_type,
           pg_catalog.pg_get_function_arguments(p.oid) as args,
           pg_catalog.pg_get_function_identity_arguments(p.oid) as arg_types,
-          CASE
-            WHEN p.proisagg THEN 'agg'
-            WHEN p.proiswindow THEN 'window'
-            WHEN p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype THEN 'trigger'
-            ELSE 'normal'
-          END as "type",
+           CASE p.prokind
+              WHEN 'a' THEN 'agg'
+              WHEN 'w' THEN 'window'
+              WHEN 'p' THEN 'proc'
+              ELSE 
+                CASE WHEN p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype 
+                  THEN 'trigger' 
+                  ELSE 'normal' 
+                END
+           END as "type",
           CASE
             WHEN p.provolatile = 'i' THEN 'immutable'
             WHEN p.provolatile = 's' THEN 'stable'
@@ -60,7 +64,7 @@ def load_attributes
           l.lanname as language,
           p.prosrc as "source",
           pg_catalog.obj_description(p.oid, 'pg_proc') as description,
-          CASE WHEN p.proisagg THEN 'agg_dummy' ELSE pg_get_functiondef(p.oid) END as definition
+          CASE WHEN  p.prokind = 'a' THEN 'agg_dummy' ELSE pg_get_functiondef(p.oid) END as definition
 
         FROM pg_catalog.pg_proc p
         LEFT JOIN pg_catalog.pg_language l ON l.oid = p.prolang

lib/dumbo/test/matchers.rb

@@ -30,7 +30,7 @@ def throw_error(expected)
     end
 
     def flat_expected(expected)
-      expected = stringify_array(expected)
+      #expected = stringify_array(expected)
       expected.size == 1 ? expected.first : expected
     end
 

lib/dumbo/test/regression_helper.rb

@@ -5,16 +5,13 @@
     path =  self.class.metadata[:file_path]
     test_file = Pathname.new(path).basename.sub_ext('.sql').sub('_spec','_test')
     test_path = test_file.realdirpath  File.expand_path('test/sql')
+    FileUtils.rm(test_path, force: true)
     FileUtils.touch(test_path)
 
     ActiveRecord::Base.logger = Dumbo::Test::Helper::SqlLogger.new(test_path)
     ActiveRecord::Base.logger.level = 0
   end
 
-  config.before(:suite) do |s|
-    FileUtils.rm_r Dir.glob('test/sql/*'), force: true
-  end
-
   config.before(:each) do |example|
     ActiveRecord::Base.logger.debug "-- " + example.metadata[:full_description]
     ActiveRecord::Base.logger.debug "-- " + example.metadata[:location]

lib/dumbo/test/silence_unknown_oid.rb

@@ -1,11 +1,9 @@
 module ActiveRecord
   module ConnectionAdapters
     class PostgreSQLAdapter
-      module DatabaseStatements
-        def warn(msg)
-          return if msg =~ /^unknown OID/
-          super
-        end
+      def warn(msg)
+        return if msg =~ /^unknown OID/
+        super
       end
     end
   end

spec/dumbo_sample/dumbo_sample--0.0.4.sql

@@ -2,10 +2,10 @@
 CREATE TYPE elephant_base;
 
 CREATE FUNCTION elephant_in(cstring) RETURNS elephant_base AS
-'$libdir/dumbo_sample' LANGUAGE C;
+'$libdir/dumbo_sample' LANGUAGE C IMMUTABLE;
 
 CREATE FUNCTION elephant_out(elephant_base) RETURNS cstring AS
-'$libdir/dumbo_sample' LANGUAGE C;
+'$libdir/dumbo_sample' LANGUAGE C IMMUTABLE;
 
 CREATE TYPE elephant_base (
   INPUT  = elephant_in,

spec/extension_spec.rb

@@ -12,7 +12,7 @@
     end
 
     it 'should return extension obj_id' do
-      expect(extension.obj_id).to match /\d+/
+      expect(extension.obj_id).to be_kind_of(Integer)
     end
 
     it 'should return a list of objects' do

spec/operator_spec.rb

@@ -23,6 +23,6 @@
   end
 
   it 'should have drop sql' do
-    expect(operator.drop).to eq 'DROP OPERATOR && (box, box);'
+    expect(operator.drop).to eq 'DROP OPERATOR IF EXISTS && (box, box);'
   end
 end