active_record_extended 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ecf1213e83b4ef3e177957d668d253541a1de09a784fbc2007a782661acc647
-  data.tar.gz: 4fbf39a2fdb8695a7ed787a672c4f0b0988e7b854757955b3883fc546fdcb3d9
+  metadata.gz: 2fad3f098c418432644e9a1038c9adba5c4c0a3d5edd29571a5eced2a413a8ec
+  data.tar.gz: fd77f4b03e3273ee84d74c87c7f2cd3264034173a7c81e91ca6ccb6a5efc733a
 SHA512:
-  metadata.gz: 3afca0a92e015572b4e318a3457f9910f43cefad6ab3286a5847bf76c4e659eb3bbdcd0ddce68bd1b1fe876866bfbcf959686e51fb55598bb38c936716715161
-  data.tar.gz: 70c7e5c95251002333b2453688f1d2f3e5fcab8c6866837969ed2570f3432771efbe56cc33a7df11ef4f47b29f18aff226fb5695ff3453a8d38f6e48b1fecd62
+  metadata.gz: e91ff546cb1c33fecd49d76cdb1a26ca7d58b7da7c30726d56559fd6a797be45c7054171e1bd5be9c70ea7604558e9df837ff84c3fbd9ae744dd37f511b00f43
+  data.tar.gz: c5745c586abbe365133638fe52e19603170a053dbaab6e451e416a4f5d58ab456468ce8a7f276d83f3d28f10d0ff9c01b18ec3c4a1e60d74f4935e72034d4b7c

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.5.x **(EOL warning!)**
+ - 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.1.x
+ - Latest Ruby supported: 3.2.x
  - Latest Rails supported: 7.0.x
- - Postgres: 11-current(14) (probably works with most older versions to a certain point)
+ - Postgres: 11-current(15) (probably works with most older versions to a certain point)
 
 ## Installation
 

data/lib/active_record_extended/query_methods/any_of.rb

@@ -5,23 +5,15 @@ module ActiveRecordExtended
     module AnyOf
       def any_of(*queries)
         queries = hash_map_queries(queries)
-        build_query(queries) do |arel_query, binds|
-          if binds.any?
-            @scope.where(unprepared_query(arel_query.to_sql), *binds)
-          else
-            @scope.where(arel_query)
-          end
+        build_query(queries) do |arel_query|
+          @scope.where(arel_query)
         end
       end
 
       def none_of(*queries)
         queries = hash_map_queries(queries)
-        build_query(queries) do |arel_query, binds|
-          if binds.any?
-            @scope.where.not(unprepared_query(arel_query.to_sql), *binds)
-          else
-            @scope.where.not(arel_query)
-          end
+        build_query(queries) do |arel_query|
+          @scope.where.not(arel_query)
         end
       end
 
@@ -37,7 +29,7 @@ module ActiveRecordExtended
 
       def build_query(queries)
         query_map = construct_query_mappings(queries)
-        query     = yield(query_map[:arel_query], query_map[:binds])
+        query     = yield(query_map[:arel_query])
         query
           .joins(query_map[:joins].to_a)
           .includes(query_map[:includes].to_a)
@@ -51,29 +43,13 @@ module ActiveRecordExtended
             query_map[:joins]      << translate_reference(query.joins_values)      if query.joins_values.any?
             query_map[:includes]   << translate_reference(query.includes_values)   if query.includes_values.any?
             query_map[:references] << translate_reference(query.references_values) if query.references_values.any?
-            query_map[:binds] += bind_attributes(query)
             query.arel.constraints.reduce(:and)
           end.reduce(:or)
         end
       end
 
-      # Rails 5.1 fix
-      # In Rails 5.2 the arel table maintains attribute binds
-      def bind_attributes(query)
-        return [] unless query.respond_to?(:bound_attributes)
-
-        query.bound_attributes.map(&:value)
-      end
-
-      # Rails 5.1 fix
-      def unprepared_query(query)
-        query.gsub(/((?<!\\)'.*?(?<!\\)'|(?<!\\)".*?(?<!\\)")|(=\ \$\d+)/) do |match|
-          Regexp.last_match(2)&.gsub(/=\ \$\d+/, "= ?") || match
-        end
-      end
-
       def translate_reference(reference)
-        reference.map { |ref| ref.try(:to_sql) || ref }.compact
+        reference.filter_map { |ref| ref.try(:to_sql) || ref }
       end
 
       def generate_where_clause(query)

data/lib/active_record_extended/query_methods/unionize.rb

@@ -107,7 +107,7 @@ module ActiveRecordExtended
       end
 
       def union(opts = :chain, *args)
-        return UnionChain.new(spawn) if opts == :chain
+        return UnionChain.new(spawn) if :chain == opts
 
         opts.nil? ? self : spawn.union!(opts, *args, chain_method: __callee__)
       end
@@ -121,7 +121,7 @@ module ActiveRecordExtended
       def union!(opts = :chain, *args, chain_method: :union)
         union_chain    = UnionChain.new(self)
         chain_method ||= :union
-        return union_chain if opts == :chain
+        return union_chain if :chain == opts
 
         union_chain.public_send(chain_method, *([opts] + args))
       end

data/lib/active_record_extended/query_methods/with_cte.rb

@@ -161,12 +161,17 @@ module ActiveRecordExtended
       end
 
       # @param [Hash, WithCTE] opts
-      def with!(opts = :chain, *_rest)
-        return WithChain.new(self) if opts == :chain
-
-        tap do |scope|
-          scope.cte ||= WithCTE.new(self)
-          scope.cte.pipe_cte_with!(opts)
+      def with!(opts = :chain, *rest)
+        case opts
+        when :chain
+          WithChain.new(self)
+        when :recursive
+          WithChain.new(self).recursive(*rest)
+        else
+          tap do |scope|
+            scope.cte ||= WithCTE.new(self)
+            scope.cte.pipe_cte_with!(opts)
+          end
         end
       end
 
@@ -176,7 +181,6 @@ module ActiveRecordExtended
         cte_statements = cte.map do |name, expression|
           grouped_expression = cte.generate_grouping(expression)
           cte_name           = cte.to_arel_sql(cte.double_quote(name.to_s))
-
           grouped_expression = add_materialized_modifier(grouped_expression, cte, name)
 
           Arel::Nodes::As.new(cte_name, grouped_expression)
@@ -193,9 +197,9 @@ module ActiveRecordExtended
 
       def add_materialized_modifier(expression, cte, name)
         if cte.materialized_key?(name)
-          Arel::Nodes::SqlLiteral.new("MATERIALIZED #{expression.to_sql}")
+          Arel.sql("MATERIALIZED #{expression.to_sql}")
         elsif cte.not_materialized_key?(name)
-          Arel::Nodes::SqlLiteral.new("NOT MATERIALIZED #{expression.to_sql}")
+          Arel.sql("NOT MATERIALIZED #{expression.to_sql}")
         else
           expression
         end

data/lib/active_record_extended/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - George Protacio-Karaszi
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-01 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !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
@@ -167,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Adds extended functionality to Activerecord Postgres implementation