torque-postgresql 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e47edba535baccbfc619501bb245f4a32d794db6
-  data.tar.gz: d46d270a45f3f03b3bbf5e2292de9cd199f21897
+  metadata.gz: 6a19c0e5178591e3b9ea84d11df0b21d34f135df
+  data.tar.gz: 06c0b78395434ae948854222ce3ad015ce55cd61
 SHA512:
-  metadata.gz: 7948fc1d1f54cb902f4fc0778d5317e7b67ad059b16253171a389f5c43054117305819611c4a6d49e6939b36b727ed525154a4f01c7559468b9cc3c26582bff1
-  data.tar.gz: 1c228d0856a13a1beef89e0fc811dfc80d73c208f46f164455a400ff6854b5d66269c7eaefe831ee72eed4de594010f4afcf9dfa893b3c0018a94ab0b5f032a8
+  metadata.gz: 90146d035616baa734f5a068028b32bf5a9605539d1f58a76f8ce107b65eeeaed8e88776d6bde29460ab340667b96a14fbf0e18f196c98d805f479511a5db167
+  data.tar.gz: f5f126cf74c95a4c3ccb4d6aab8f69c82a5e37215ea79928d2bc261f819d00db8c6721e059e954c9dd353182a74794c31668630ce58dac49f6274c5a113d919f

data/lib/torque/postgresql/adapter.rb

@@ -11,7 +11,7 @@ module Torque
     module Adapter
 
       include Quoting
-      include ColumnDumper
+      include ColumnDumper unless Torque::PostgreSQL::AR521
       include DatabaseStatements
       include SchemaStatements
 

data/lib/torque/postgresql/adapter/database_statements.rb

@@ -33,15 +33,26 @@ module Torque
         end
 
         # Change some of the types being mapped
-        def initialize_type_map(m)
+        def initialize_type_map(m = type_map)
           super
           m.register_type 'interval', OID::Interval.new
         end
 
-        # Add the composite types to be loaded too.
-        def load_additional_types(type_map, oids = nil)
-          super
+        # :nodoc:
+        if Torque::PostgreSQL::AR521
+          def load_additional_types(oids = nil)
+            super
+            torque_load_additional_types(oids)
+          end
+        else
+          def load_additional_types(type_map, oids = nil)
+            super
+            torque_load_additional_types(oids)
+          end
+        end
 
+        # Add the composite types to be loaded too.
+        def torque_load_additional_types(oids = nil)
           filter = "AND     a.typelem::integer IN (%s)" % oids.join(", ") if oids
 
           query = <<-SQL

data/lib/torque/postgresql/adapter/oid/interval.rb

@@ -81,7 +81,7 @@ module Torque
               num = num.to_i unless num.is_a?(Numeric)
               if num > 0
                 seconds += num.send(part).value
-                [part, num]
+                [part.to_sym, num]
               end
             end
             ActiveSupport::Duration.new(seconds, parts.compact)

data/lib/torque/postgresql/adapter/schema_definitions.rb

@@ -3,10 +3,16 @@ module Torque
     module Adapter
       module ColumnMethods
 
+        # Creates a column with an interval type, allowing span of times and
+        # dates to be stored without having to store a seconds-based integer
+        # or any sort of other approach
         def interval(*args, **options)
           args.each { |name| column(name, :interval, options) }
         end
 
+        # Creates a column with an enum type, needing to specify the subtype,
+        # which is basically the name of the type defined prior creating the
+        # column
         def enum(*args, **options)
           args.each do |name|
             type = options.fetch(:subtype, name)
@@ -21,7 +27,7 @@ module Torque
 
         attr_reader :inherits
 
-        def initialize(name, *args, **options)
+        def initialize(name, *_, **options)
           old_args = []
           old_args << options.delete(:temporary) || false
           old_args << options.delete(:options)

data/lib/torque/postgresql/adapter/schema_dumper.rb

@@ -4,8 +4,10 @@ module Torque
       module ColumnDumper
 
         # Adds +:subtype+ as a valid migration key
-        def migration_keys
-          super + [:subtype]
+        unless Torque::PostgreSQL::AR521
+          def migration_keys
+            super + [:subtype]
+          end
         end
 
         # Adds +:subtype+ option to the default set
@@ -22,7 +24,7 @@ module Torque
         private
 
           def schema_subtype(column)
-            column.sql_type.to_sym.inspect if [:enum].include? column.type
+            column.sql_type.to_sym.inspect if column.type == :enum
           end
 
       end

data/lib/torque/postgresql/config.rb

@@ -2,6 +2,9 @@ module Torque
   module PostgreSQL
     include ActiveSupport::Configurable
 
+    # Stores a version check for compatibility purposes
+    AR521 = (ActiveRecord.gem_version >= Gem::Version.new('5.2.1'))
+
     # Allow nested configurations
     # :TODO: Rely on +inheritable_copy+ to make nested configurations
     config.define_singleton_method(:nested) do |name, &block|

data/lib/torque/postgresql/relation.rb

@@ -76,7 +76,7 @@ module Torque
           @dynamic_selection ||= []
         end
 
-        def build_arel
+        def build_arel(*)
           arel = super
           arel.project(*dynamic_selection) if select_values.blank? && dynamic_selection.any?
           arel

data/lib/torque/postgresql/relation/auxiliary_statement.rb

@@ -33,15 +33,20 @@ module Torque
         # Get all auxiliary statements bound attributes and the base bound
         # attributes as well
         def bound_attributes
-          return super unless self.auxiliary_statements_values.present?
-          bindings = self.auxiliary_statements_values.map(&:bound_attributes)
-          (bindings + super).flatten
+          if Torque::PostgreSQL::AR521
+            visitor = ::Arel::Visitors::PostgreSQL.new(ActiveRecord::Base.connection)
+            visitor.accept(self.arel.ast, ::Arel::Collectors::Bind.new).value
+          else
+            return super unless self.auxiliary_statements_values.present?
+            bindings = self.auxiliary_statements_values.map(&:bound_attributes)
+            (bindings + super).flatten
+          end
         end
 
         private
 
           # Hook arel build to add the distinct on clause
-          def build_arel
+          def build_arel(*)
             arel = super
             build_auxiliary_statements(arel)
             arel

data/lib/torque/postgresql/relation/distinct_on.rb

@@ -32,8 +32,8 @@ module Torque
         private
 
           # Hook arel build to add the distinct on clause
-          def build_arel
-            arel = super
+          def build_arel(*)
+            arel = Torque::PostgreSQL::AR521 ? super : super()
             value = self.distinct_on_values
             arel.distinct_on(resolve_column(value)) if value.present?
             arel

data/lib/torque/postgresql/relation/inheritance.rb

@@ -57,7 +57,7 @@ module Torque
         private
 
           # Hook arel build to add any necessary table
-          def build_arel
+          def build_arel(*)
             arel = super
             arel.only if self.itself_only_value === true
             build_inheritances(arel)

data/lib/torque/postgresql/schema_dumper.rb

@@ -2,6 +2,8 @@ module Torque
   module PostgreSQL
     module SchemaDumper
 
+      include Adapter::ColumnDumper if Torque::PostgreSQL::AR521
+
       def dump(stream) # :nodoc:
         @connection.dump_mode!
         super
@@ -80,6 +82,10 @@ module Torque
 
     end
 
-    ActiveRecord::SchemaDumper.prepend SchemaDumper
+    if Torque::PostgreSQL::AR521
+      ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend SchemaDumper
+    else
+      ActiveRecord::SchemaDumper.prepend SchemaDumper
+    end
   end
 end

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '0.2.12'
+    VERSION = '0.2.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement