activerecord-multirange 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b09cdb0717d19e40572d66ecb2e7774494057658fb3409fefdf04a67db06345
-  data.tar.gz: aa643ce5bf82da7e69b042478ee884668fd1970da0861b91e43e7a5c2e4ae3e4
+  metadata.gz: f87d2966974c30e9f99e685735b5e170e3f29be0bd91c859c87e2dea1dc08b7c
+  data.tar.gz: 19392c448ddffa2060f95e2cca9b9179e76c14d8118b71547ac164f0f3b0ce2f
 SHA512:
-  metadata.gz: 31209bbe807b481f93275650fae69c2c23fa76518fc987890daec2c619f595571467cb55fdd8cc526e8bc4e007af68eb9f239e68d810854dc3e6977c4631d248
-  data.tar.gz: 87c60c9246d43e7b148c02798171df9747b7aa2fb5c21b40969ed77b8461064440d4f9f73840f2b5d8aa11cd47d33017d48fbfb9a9c9ad28da7ce952e713fa26
+  metadata.gz: 7007b2ca7b1783f54dc75445dbaeb52af74b84573fcce2be230f6833be6d61efd6015a6157800a391be437d544f9eb2a5d61a7b5af40ff809b835fabc5626871
+  data.tar.gz: '0682628116f285b5477ec182a3635642134fa95a76a8bd986bae217a51cafa3cdf33803797d2c31a659cebef9c16e5356f265965485860cb01deaadba34fa212'

data/Gemfile.lock

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

data/docker-compose.yml

@@ -0,0 +1,23 @@
+version: '3.8'
+
+services:
+  postgres:
+    image: postgres:15-alpine
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: activerecord_multirange_test
+    ports:
+      - "15432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+      - ./docker/postgres-init:/docker-entrypoint-initdb.d
+    command: postgres -c shared_preload_libraries=pg_stat_statements
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  postgres_data: 

data/lib/activerecord-multirange/adapter.rb

@@ -16,13 +16,13 @@ module Activerecord
         initializer =
           ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::TypeMapInitializer
             .new(type_map)
-        
+
         # 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, 
+          SELECT m.oid, m.typname, m.typelem, m.typdelim, m.typinput::varchar,
                  pr.rngsubtype, m.typtype, m.typbasetype
-          FROM pg_type m 
+          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
           WHERE m.typtype = 'm';

data/lib/activerecord-multirange/quoting.rb

@@ -5,21 +5,84 @@ module Activerecord
     module Quoting
       def quote(value)
         return quote(encode_multirange(value)) if value.is_a?(::Activerecord::Multirange::OID::MultiRange::Data)
+        return quote_array_as_multirange(value) if array_of_ranges?(value)
 
         super
       end
 
       def type_cast(value)
         return encode_multirange(value) if value.is_a?(::Activerecord::Multirange::OID::MultiRange::Data)
+        return encode_array_as_multirange(value) if array_of_ranges?(value)
 
         super
       end
 
+      # Override the bound value quoting for parameter binding in WHERE clauses
+      def quoted_literal(value)
+        if array_of_ranges?(value)
+          encode_array_as_multirange(value)
+        else
+          super
+        end
+      end
+
+      # Override quote_bound_value for newer Rails versions
+      def quote_bound_value(value)
+        if array_of_ranges?(value)
+          "'#{encode_array_as_multirange(value)}'"
+        else
+          super
+        end
+      end
+
+      # Override for default expression quoting
+      def quote_default_expression(value, column)
+        if array_of_ranges?(value)
+          "'#{encode_array_as_multirange(value)}'"
+        else
+          super
+        end
+      end
+
+      # Override sanitize_sql_array to catch arrays of ranges at parameter binding level
+      def sanitize_sql_array(ary)
+        statement, *values = ary
+        if statement.respond_to?(:to_str)
+          # Convert arrays of ranges to multirange format in the values
+          converted_values = values.map do |value|
+            if array_of_ranges?(value)
+              encode_array_as_multirange(value)
+            else
+              value
+            end
+          end
+          sanitize_sql_for_conditions([statement, *converted_values])
+        else
+          super
+        end
+      end
+
       def encode_multirange(range_data)
         collection = range_data.ranges.map { |r| encode_range(r) }.join(",")
 
         "{#{collection}}"
       end
+
+      private
+
+      def array_of_ranges?(value)
+        value.is_a?(::Array) && value.all? { |item| item.is_a?(::Range) }
+      end
+
+      def quote_array_as_multirange(ranges)
+        encoded_multirange = encode_array_as_multirange(ranges)
+        "'#{encoded_multirange}'"
+      end
+
+      def encode_array_as_multirange(ranges)
+        collection = ranges.map { |r| encode_range(r) }.join(",")
+        "{#{collection}}"
+      end
     end
   end
 end

data/lib/activerecord-multirange/relation.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Activerecord
+  module Multirange
+    module Relation
+      def where(opts = :chain, *rest)
+        if opts.is_a?(String) && rest.any?
+          # Convert any arrays of ranges in the parameters to multirange format
+          converted_rest = rest.map do |param|
+            if array_of_ranges?(param)
+              encode_array_as_multirange(param)
+            else
+              param
+            end
+          end
+          super(opts, *converted_rest)
+        else
+          super
+        end
+      end
+
+      private
+
+      def array_of_ranges?(value)
+        value.is_a?(::Array) && value.all? { |item| item.is_a?(::Range) }
+      end
+
+      def encode_array_as_multirange(ranges)
+        collection = ranges.map { |r| connection.send(:encode_range, r) }.join(",")
+        "{#{collection}}"
+      end
+    end
+  end
+end 

data/lib/activerecord-multirange/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Multirange
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
 end

data/lib/activerecord-multirange.rb

@@ -6,6 +6,7 @@ require 'activerecord-multirange/quoting'
 require 'activerecord-multirange/schema_statements'
 require 'activerecord-multirange/table_definition'
 require 'activerecord-multirange/type_map'
+require 'activerecord-multirange/relation'
 require 'active_record'
 
 module Activerecord
@@ -38,6 +39,7 @@ module Activerecord
         ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.prepend(
           TableDefinition
         )
+        ActiveRecord::Relation.prepend(Relation)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multirange
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Gustavo Warmling Teixeira
 bindir: exe
 cert_chain: []
-date: 2025-06-11 00:00:00.000000000 Z
+date: 2025-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -122,11 +122,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- activerecord-multirange-1.1.0.gem
 - config.ru
+- docker-compose.yml
 - lib/activerecord-multirange.rb
 - lib/activerecord-multirange/adapter.rb
 - lib/activerecord-multirange/oid/multi_range.rb
 - lib/activerecord-multirange/quoting.rb
+- lib/activerecord-multirange/relation.rb
 - lib/activerecord-multirange/schema_statements.rb
 - lib/activerecord-multirange/table_definition.rb
 - lib/activerecord-multirange/type_map.rb