activerecord-multirange 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e8ec13d27ae216e0f400e1624b05c71e9276a450e53622aba243f181443213a
-  data.tar.gz: 1ee4ac085770e7711541f70eccebaf8fc6e3fb11c45f6e49ebaece4536d29420
+  metadata.gz: 713159095b3f14f7031bd8488b32d8f9880fa7870437b034d66c87eaaf23e24c
+  data.tar.gz: 0d2f435fe0dd5b5d0959100fdccce2c6ca207f28c570c781c190353b373c623f
 SHA512:
-  metadata.gz: efa82b9f56b823dafa589c40de04d072aa9c6d7e6deefb4933e3460fecee039ec77952108709803647a77d7d9a42eac3805ed3a8637dcf64c2ed07bca31a65cb
-  data.tar.gz: 2aaf66267a719ae95509a1a8ce50eb78b476734c74ad15f7ee8ca0c778b59fbbfcf490c08974421deda75aa94a0b2c17527d008b52f664ddbb7976a842449b47
+  metadata.gz: 4690a5657d8f0c82c4a2b4e7c91efc7976a04579804c1f53af3be935340df5e4ad7229502427f0084adfd8abbb73a0ca436b6741a4a98af149e4531fba0b9b08
+  data.tar.gz: 125885f599acd13e58e35258cbefee3bcde4d3b8a766f0668a7583e80ea0b7b6c37ee7ba7bd6da9331211724decac14b1e0195efa26f92103c9513eff3428fbb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-multirange (1.2.1)
+    activerecord-multirange (1.3.0)
       pg (>= 1)
       rails (>= 6)
 

data/lib/activerecord-multirange/adapter.rb

@@ -20,20 +20,18 @@ module Activerecord
         # Query for multirange types and their corresponding base types (not range types)
         # We need to get the range's subtype (e.g., date) not the range type itself
         query = <<-QUERY.squish
-          SELECT m.oid, m.typname, m.typelem, m.typdelim, m.typinput::varchar,
+          SELECT m.oid, m.typname, m.typelem, m.typdelim, m.typinput, 
                  pr.rngsubtype, m.typtype, m.typbasetype
-          FROM pg_type m
-          JOIN pg_type r ON REPLACE(m.typname, 'multirange', 'range') = r.typname
-          JOIN pg_range pr ON r.oid = pr.rngtypid
+          FROM pg_type m 
+          JOIN pg_range pr ON m.oid = pr.rngmultitypid
           WHERE m.typtype = 'm';
         QUERY
 
         # Use exec_query for all Rails versions since execute_and_clear is private
         result = exec_query(query, 'SCHEMA', [])
+
         # Convert rows to hash format with column names as keys
-        records = result.rows.map do |row|
-          result.columns.zip(row).to_h
-        end
+        records = result.rows.map { |row| result.columns.zip(row).to_h }
         initializer.register_multirange_type(records)
       end
     end

data/lib/activerecord-multirange/oid/multi_range.rb

@@ -35,7 +35,9 @@ module Activerecord
         end
 
         def cast_value(value)
-          return nil if value.blank?
+          return nil if value.nil?
+          return [] if value.is_a?(::Array) && value.empty?
+          return value if value.is_a?(::Array)
           return value unless value.is_a?(::String)
 
           ranges = scan_ranges(value)

data/lib/activerecord-multirange/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Multirange
-    VERSION = '1.2.1'
+    VERSION = '1.3.0'
   end
 end

data/lib/activerecord-multirange.rb

@@ -16,12 +16,24 @@ module Activerecord
 
     # Multirange types that need to be registered
     MULTIRANGE_TYPES = {
-      tsmultirange: { name: "tsmultirange" },
-      datemultirange: { name: "datemultirange" },
-      tstzmultirange: { name: "tstzmultirange" },
-      nummultirange: { name: "nummultirange" },
-      int8multirange: { name: "int8multirange" },
-      int4multirange: { name: "int4multirange" }
+      tsmultirange: {
+        name: 'tsmultirange'
+      },
+      datemultirange: {
+        name: 'datemultirange'
+      },
+      tstzmultirange: {
+        name: 'tstzmultirange'
+      },
+      nummultirange: {
+        name: 'nummultirange'
+      },
+      int8multirange: {
+        name: 'int8multirange'
+      },
+      int4multirange: {
+        name: 'int4multirange'
+      }
     }.freeze
 
     def self.add_multirange_column_type
@@ -29,6 +41,13 @@ module Activerecord
         # Register multirange types in NATIVE_DATABASE_TYPES for Rails 8 compatibility
         Activerecord::Multirange.register_native_database_types
 
+        # Register multirange modifier for ActiveRecord attribute API
+        ActiveRecord::Type.add_modifier(
+          { multirange: true },
+          Activerecord::Multirange::OID::MultiRange,
+          adapter: :postgresql
+        )
+
         ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Adapter)
         ActiveRecord::ConnectionAdapters::PostgreSQL::OID::TypeMapInitializer
           .prepend(TypeMap)
@@ -45,19 +64,21 @@ module Activerecord
 
     def self.register_native_database_types
       # Ensure the PostgreSQL adapter is loaded
-      return unless defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+      unless defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+        return
+      end
 
       adapter_class = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
 
       # Check if NATIVE_DATABASE_TYPES is already defined and modifiable
       if adapter_class.const_defined?(:NATIVE_DATABASE_TYPES)
         current_types = adapter_class::NATIVE_DATABASE_TYPES
-        
+
         # Only modify if our types aren't already registered
         unless current_types.key?(:tsmultirange)
           # Create a new hash with existing types plus our multirange types
           new_types = current_types.merge(MULTIRANGE_TYPES)
-          
+
           # Replace the constant with the updated hash
           adapter_class.send(:remove_const, :NATIVE_DATABASE_TYPES)
           adapter_class.const_set(:NATIVE_DATABASE_TYPES, new_types.freeze)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multirange
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Gustavo Warmling Teixeira