schema_plus_functions 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09790e6271a884bb4cf768a7f75a25ef2cce002b91b9c2bc066f6992ea340cb0'
-  data.tar.gz: f87cde834a3236137bbcc1aa0be6f417c186c8d505ef0c6ed421c68fe4224c70
+  metadata.gz: 97ddb7cc035fe6b3c6eb8c978dac3eee75e0a5d05777e98276f3ed5ee72c28fe
+  data.tar.gz: d82144c01af082317627651336579ed61012787d22886e516c23fc18d85c55e8
 SHA512:
-  metadata.gz: 61e40e645fb97bc23908992339eefe32fd99574f6846e4d7cc5d27ab064e9eca14faacb1445901d3e91757a61a27e1ee1a5d34d99ad3e85cf1bf2e3503fdcb60
-  data.tar.gz: e355ac3b4266adbff2f1d97690e725818d124a8a1f00c9976df23c35a862a51c7df7c72482c4d1be3c456d7fade5f7b742ed7a84c4b01a15d25a5bbab568c9b4
+  metadata.gz: 627ccbf5e98a0ac319af3570c6cb6a251ab2b84d619741dd4cf7baa549d66204880a6647bb702f5ea1470b74c01becfb0765b9ede185897399f47004f6f0ed4f
+  data.tar.gz: 7a2eb4a75d6cc1167028a83ec49854176846531e8039c59995e2c62d388b0dab1d5f3e2658e72f694aef6149ed19406c18a8b7f8dde76cec3e1a68ac166eb4bb

data/.travis.yml

@@ -3,14 +3,36 @@
 # Please do not edit this file; any changes will be overwritten next time
 # schema_dev gets run.
 ---
-sudo: false
 rvm:
 - 2.3.1
 gemfile:
 - gemfiles/activerecord-5.2/Gemfile.postgresql
-env: POSTGRESQL_DB_USER=postgres
-addons:
-  postgresql: '9.4'
 before_script: bundle exec rake create_databases
 after_script: bundle exec rake drop_databases
 script: bundle exec rake travis
+jobs:
+  include:
+  - addons:
+      postgresql: '9.6'
+    env: POSTGRESQL_DB_USER=postgres
+  - addons:
+      postgresql: '10'
+      apt:
+        packages:
+        - postgresql-10
+        - postgresql-client-10
+    env: POSTGRESQL_DB_USER=postgres
+  - addons:
+      postgresql: '11'
+      apt:
+        packages:
+        - postgresql-11
+        - postgresql-client-11
+    env: POSTGRESQL_DB_USER=travis PGPORT=5433
+  - addons:
+      postgresql: '12'
+      apt:
+        packages:
+        - postgresql-12
+        - postgresql-client-12
+    env: POSTGRESQL_DB_USER=travis PGPORT=5433

data/README.md

@@ -91,6 +91,7 @@ SchemaPlus::Functions is tested on:
 
 ## History
 
+* 0.2.0 - Add suppot for PostgreSQL 11+
 * 0.1.0 - Initial release
 
 ## Development & Testing

data/lib/schema_plus/functions/active_record/connection_adapters/postgresql_adapter.rb

@@ -9,18 +9,30 @@ module SchemaPlus::Functions
           super(function_name, clean_params, options)
         end
 
+        def postgresql_version_at_least?(env, required)
+          @postgresql_version ||= begin
+                                    env.connection.select_value("SHOW server_version").match(/(\d+\.\d+)/)[1]
+                                  end
+          Gem::Version.new(@postgresql_version) >= Gem::Version.new(required)
+        end
+
         def functions(name = nil) #:nodoc:
           SchemaMonkey::Middleware::Schema::Functions.start(connection: self, query_name: name, functions: []) do |env|
+            is_agg_column = if postgresql_version_at_least?(env, '11.0')
+                              "prokind = 'a'"
+                            else
+                              "proisagg"
+                            end
             sql = <<-SQL
-            SELECT P.proname as function_name, pg_get_function_identity_arguments(P.oid), proisagg as is_agg
-              FROM pg_proc P
-            WHERE
-                  pronamespace IN (SELECT oid FROM pg_namespace WHERE nspname = ANY (current_schemas(false))) 
-              AND NOT EXISTS (SELECT 1 FROM pg_depend WHERE classid = 'pg_proc'::regclass 
-                    AND objid = p.oid AND deptype = 'i')
-              AND NOT EXISTS (SELECT 1 FROM pg_depend WHERE classid = 'pg_proc'::regclass
-                    AND objid = p.oid AND refclassid = 'pg_extension'::regclass AND deptype = 'e')
-            ORDER BY 1,2
+              SELECT P.proname as function_name, pg_get_function_identity_arguments(P.oid), #{is_agg_column} as is_agg
+                FROM pg_proc P
+              WHERE
+                    pronamespace IN (SELECT oid FROM pg_namespace WHERE nspname = ANY (current_schemas(false))) 
+                AND NOT EXISTS (SELECT 1 FROM pg_depend WHERE classid = 'pg_proc'::regclass 
+                      AND objid = p.oid AND deptype = 'i')
+                AND NOT EXISTS (SELECT 1 FROM pg_depend WHERE classid = 'pg_proc'::regclass
+                      AND objid = p.oid AND refclassid = 'pg_extension'::regclass AND deptype = 'e')
+              ORDER BY 1,2
             SQL
 
             env.functions += env.connection.query(sql, env.query_name).map do |row|

data/lib/schema_plus/functions/version.rb

@@ -2,6 +2,6 @@
 
 module SchemaPlus
   module Functions
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/schema_dev.yml

@@ -4,3 +4,5 @@ activerecord:
     - 5.2
 db:
     - postgresql
+dbversions:
+    postgresql: ['9.6','10', '11', '12']

data/schema_plus_functions.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake", "~> 10.0"
   gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "schema_dev", "~> 3.11", ">= 3.11.1"
+  gem.add_development_dependency "schema_dev", "~> 3.12"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "simplecov-gem-profile"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_functions
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Edward Rudd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -92,20 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.11.1
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.11.1
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Adds support for functions in ActiveRecord