active_record_extended 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fad3f098c418432644e9a1038c9adba5c4c0a3d5edd29571a5eced2a413a8ec
-  data.tar.gz: fd77f4b03e3273ee84d74c87c7f2cd3264034173a7c81e91ca6ccb6a5efc733a
+  metadata.gz: 978b35d2ba33492c2de59e8d26fbc1f176ae1d8a19046a3e3276e693d3f6195f
+  data.tar.gz: 7a620d8e05d23252e4631c2a91f3bc62f8d983191631c2438ab98b5d0640e90a
 SHA512:
-  metadata.gz: e91ff546cb1c33fecd49d76cdb1a26ca7d58b7da7c30726d56559fd6a797be45c7054171e1bd5be9c70ea7604558e9df837ff84c3fbd9ae744dd37f511b00f43
-  data.tar.gz: c5745c586abbe365133638fe52e19603170a053dbaab6e451e416a4f5d58ab456468ce8a7f276d83f3d28f10d0ff9c01b18ec3c4a1e60d74f4935e72034d4b7c
+  metadata.gz: 9c0f2ba4720495e95a53bf8971ce634af1d2eaf88af05faff5328bfcfadfb7f5da61c5e7984e46389b8b495cd5966fcedeaffac1317474042dd7bf67464c3408
+  data.tar.gz: 94ae654f051a427e745e8e761411df466cd4ed64b7a131d9326fa05d82e06f5ba0daa81dfa83f6a6be9ec252fa08d41d1559b87098616413606ea67444af1f38

data/README.md

@@ -52,12 +52,12 @@ Active Record Extended is essentially providing users with the other half of Pos
 ## Compatibility
 
 This package is designed align and work with any officially supported Ruby and Rails versions.
- - Minimum Ruby Version: 2.7.x **(EOL warning!)**
- - Minimum Rails Version: 5.2.x **(EOL warning!)**
- - Minimum Postgres Version: 11.x **(EOL warning!)**
- - Latest Ruby supported: 3.2.x
- - Latest Rails supported: 7.0.x
- - Postgres: 11-current(15) (probably works with most older versions to a certain point)
+ - Minimum Ruby Version: 3.1.x **(EOL warning!)**
+ - Minimum Rails Version: 6.1.x **(EOL warning!)**
+ - Minimum Postgres Version: 12.x **(EOL warning!)**
+ - Latest Ruby supported: 3.3.x
+ - Latest Rails supported: 7.1.x
+ - Postgres: 11-current(16) (probably works with most older versions to a certain point)
 
 ## Installation
 

data/lib/active_record_extended/arel/nodes.rb

@@ -5,10 +5,6 @@ require "arel/nodes/function"
 
 module Arel
   module Nodes
-    unless ActiveRecordExtended::AR_VERSION_GTE_6_1
-      ["Contains", "Overlaps"].each { |binary_node_name| const_set(binary_node_name, Class.new(::Arel::Nodes::Binary)) }
-    end
-
     [
       "ContainsHStore",
       "ContainsArray",

data/lib/active_record_extended/arel/visitors/postgresql_decorator.rb

@@ -8,29 +8,6 @@ module ActiveRecordExtended
       private
 
       # rubocop:disable Naming/MethodName
-
-      unless ActiveRecordExtended::AR_VERSION_GTE_6_1
-        def visit_Arel_Nodes_Overlaps(object, collector)
-          infix_value object, collector, " && "
-        end
-      end
-
-      unless ActiveRecordExtended::AR_VERSION_GTE_6_1
-        def visit_Arel_Nodes_Contains(object, collector)
-          left_column = object.left.relation.name.classify.constantize.columns.detect do |col|
-            matchable_column?(col, object)
-          end
-
-          if [:hstore, :jsonb].include?(left_column&.type)
-            visit_Arel_Nodes_ContainsHStore(object, collector)
-          elsif left_column.try(:array)
-            visit_Arel_Nodes_ContainsArray(object, collector)
-          else
-            visit_Arel_Nodes_Inet_Contains(object, collector)
-          end
-        end
-      end
-
       def visit_Arel_Nodes_ContainsArray(object, collector)
         infix_value object, collector, " @> "
       end

data/lib/active_record_extended/patch/array_handler_patch.rb

@@ -13,7 +13,7 @@ module ActiveRecordExtended
           return attribute.eq(value) if column.try(:array)
         end
 
-        super(attribute, value)
+        super
       end
     end
   end

data/lib/active_record_extended/query_methods/foster_select.rb

@@ -7,7 +7,7 @@ module ActiveRecordExtended
         include ActiveRecordExtended::Utilities::Support
         include ActiveRecordExtended::Utilities::OrderBy
 
-        AGGREGATE_ONE_LINERS = /^(exists|sum|max|min|avg|count|jsonb?_agg|(bit|bool)_(and|or)|xmlagg|array_agg)$/.freeze
+        AGGREGATE_ONE_LINERS = /^(exists|sum|max|min|avg|count|jsonb?_agg|(bit|bool)_(and|or)|xmlagg|array_agg)$/
 
         def initialize(scope)
           @scope = scope

data/lib/active_record_extended/query_methods/unionize.rb

@@ -92,16 +92,16 @@ module ActiveRecordExtended
         unionized_name:        lambda { |klass| klass.arel_table.name }
       }.each_pair do |method_name, default|
         define_method(method_name) do
-          return unionize_storage[method_name] if send("#{method_name}?")
+          return unionize_storage[method_name] if send(:"#{method_name}?")
 
           (default.is_a?(Proc) ? default.call(@klass) : default.new)
         end
 
-        define_method("#{method_name}?") do
+        define_method(:"#{method_name}?") do
           unionize_storage.key?(method_name) && !unionize_storage[method_name].presence.nil?
         end
 
-        define_method("#{method_name}=") do |value|
+        define_method(:"#{method_name}=") do |value|
           unionize_storage![method_name] = value
         end
       end

data/lib/active_record_extended/query_methods/where_chain.rb

@@ -46,26 +46,7 @@ module ActiveRecordExtended
       #   # SELECT tags.* FROM tags INNER JOIN user on user.id = tags.user_id WHERE user.data @> { nickname: 'chainer' }
       #
       def contains(opts, *rest)
-        if ActiveRecordExtended::AR_VERSION_GTE_6_1
-          return substitute_comparisons(opts, rest, Arel::Nodes::Contains, "contains")
-        end
-
-        build_where_chain(opts, rest) do |arel|
-          case arel
-          when Arel::Nodes::In, Arel::Nodes::Equality
-            column = left_column(arel) || column_from_association(arel)
-
-            if [:hstore, :jsonb].include?(column.type)
-              Arel::Nodes::ContainsHStore.new(arel.left, arel.right)
-            elsif column.try(:array)
-              Arel::Nodes::ContainsArray.new(arel.left, arel.right)
-            else
-              raise ArgumentError.new("Invalid argument for .where.contains(), got #{arel.class}")
-            end
-          else
-            raise ArgumentError.new("Invalid argument for .where.contains(), got #{arel.class}")
-          end
-        end
+        substitute_comparisons(opts, rest, Arel::Nodes::Contains, "contains")
       end
 
       private
@@ -111,11 +92,7 @@ module ActiveRecordExtended
       end
 
       def build_where_clause_for(scope, opts, rest)
-        if ActiveRecordExtended::AR_VERSION_GTE_6_1
-          scope.send(:build_where_clause, opts, rest)
-        else
-          scope.send(:where_clause_factory).build(opts, rest)
-        end
+        scope.send(:build_where_clause, opts, rest)
       end
     end
   end

data/lib/active_record_extended/query_methods/with_cte.rb

@@ -44,7 +44,7 @@ module ActiveRecordExtended
         end
 
         # @param [Hash, WithCTE] value
-        def pipe_cte_with!(value)
+        def pipe_cte_with!(value) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
           return if value.nil? || value.empty?
 
           value.each_pair do |name, expression|
@@ -54,6 +54,8 @@ module ActiveRecordExtended
             # Ensure we follow FIFO pattern.
             # If the parent has similar CTE alias keys, we want to favor the parent's expressions over its children's.
             if expression.is_a?(ActiveRecord::Relation) && expression.with_values?
+              expression.cte = expression.cte.dup if expression.cte
+
               # Add child's materialized keys to the parent
               @materialized_keys += expression.cte.materialized_keys
               @not_materialized_keys += expression.cte.not_materialized_keys
@@ -136,6 +138,11 @@ module ActiveRecordExtended
         !(cte.nil? || cte.empty?)
       end
 
+      # @return [Array<Hash>]
+      def with_values
+        with_values? ? [cte.with_values] : []
+      end
+
       # @param [Hash, WithCTE] values
       def with_values=(values)
         cte.with_values = values

data/lib/active_record_extended/utilities/support.rb

@@ -2,7 +2,7 @@
 
 module ActiveRecordExtended
   module Utilities
-    module Support
+    module Support # rubocop:disable Metrics/ModuleLength
       A_TO_Z_KEYS = ("a".."z").to_a.freeze
 
       # We need to ensure we can flatten nested ActiveRecord::Relations

data/lib/active_record_extended/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordExtended
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - George Protacio-Karaszi
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -46,96 +46,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-sqlimit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
 description: Adds extended functionality to Activerecord Postgres implementation
 email:
 - georgekaraszi@gmail.com
@@ -181,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Adds extended functionality to Activerecord Postgres implementation