active_record_extended 1.4.0 → 2.0.0

data/spec/query_methods/unionize_spec.rb

@@ -17,13 +17,13 @@ RSpec.describe "Active Record Union Methods" do
 
     it "should raise an error if the select statements do not align" do
       expect { misaligned_cmd.to_a }.to(
-        raise_error(ActiveRecord::StatementInvalid, /each [[:alpha:]]+ query must have the same number of columns/),
+        raise_error(ActiveRecord::StatementInvalid, /each [[:alpha:]]+ query must have the same number of columns/)
       )
     end
 
     it "should raise an argument error if there are less then two union statements" do
       expect { lacking_union_cmd.to_a }.to(
-        raise_error(ArgumentError, "You are required to provide 2 or more unions to join!"),
+        raise_error(ArgumentError, "You are required to provide 2 or more unions to join!")
       )
     end
   end
@@ -88,7 +88,7 @@ RSpec.describe "Active Record Union Methods" do
       query =
         User.union.intersect(
           User.select(:id, "profile_ls.likes").joins(:profile_l).where(profile_ls: { likes: 100 }),
-          User.select(:id, "profile_ls.likes").joins(:profile_l).where("profile_ls.likes < 150"),
+          User.select(:id, "profile_ls.likes").joins(:profile_l).where("profile_ls.likes < 150")
         )
 
       expect(query.pluck(:id)).to have_attributes(size: 1).and(eq([user_one_pl.id]))
@@ -129,7 +129,7 @@ RSpec.describe "Active Record Union Methods" do
       query =
         User.union.all(
           User.where(id: user_one.id),
-          User.where(id: user_three.id),
+          User.where(id: user_three.id)
         ).order_union(id: :desc)
 
       expect(query).to eq([user_three, user_one])
@@ -144,7 +144,7 @@ RSpec.describe "Active Record Union Methods" do
       query =
         User.union.intersect(
           User.where("id < ?", user_three.id),
-          User.where("id >= ?", user_one.id),
+          User.where("id >= ?", user_one.id)
         ).order_union(id: :desc)
 
       expect(query).to eq([user_two, user_one])

data/spec/query_methods/with_cte_spec.rb

@@ -3,8 +3,8 @@
 require "spec_helper"
 
 RSpec.describe "Active Record With CTE Query Methods" do
-  let!(:user_one)  { User.create! }
-  let!(:user_two)  { User.create! }
+  let!(:user_one)    { User.create! }
+  let!(:user_two)    { User.create! }
   let!(:profile_one) { ProfileL.create!(user_id: user_one.id, likes: 200) }
   let!(:profile_two) { ProfileL.create!(user_id: user_two.id, likes: 500) }
 
@@ -35,6 +35,16 @@ RSpec.describe "Active Record With CTE Query Methods" do
 
         expect(query).to match_array([user_one])
       end
+
+      it "should contain a unique list of ordered CTE keys when merging in multiple children" do
+        x     = User.with(profile: ProfileL.where("likes < 300"))
+        y     = User.with(profile: ProfileL.where("likes > 400"))
+        z     = y.merge(x).joins("JOIN profile ON profile.id = users.id") # Y should reject X's CTE (FIFO)
+        query = User.with(my_profile: z).joins("JOIN my_profile ON my_profile.id = users.id")
+
+        expect(query.cte.with_keys).to eq([:profile, :my_profile])
+        expect(query).to match_array([user_two])
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ end
 ActiveRecord::Base.establish_connection(ENV["DATABASE_URL"])
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require File.expand_path(f) }
-Dir["#{File.dirname(__FILE__)}/**/*examples.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/**/*examples.rb"].sort.each { |f| require f }
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

data/spec/sql_inspections/any_of_sql_spec.rb

@@ -5,8 +5,8 @@ require "spec_helper"
 RSpec.describe "Any / None of SQL Queries" do
   let(:equal_query) { '"users"."personal_id" = 1' }
   let(:or_query)    { 'OR "users"."personal_id" = 2' }
-  let(:equal_or)    { equal_query + " " + or_query }
-  let(:join_query)  { /INNER JOIN \"tags\" ON \"tags\".\"user_id\" = \"users\".\"id/ }
+  let(:equal_or)    { "#{equal_query} #{or_query}" }
+  let(:join_query)  { /INNER JOIN "tags" ON "tags"."user_id" = "users"."id/ }
 
   describe "where.any_of/1" do
     it "should group different column arguments into nested or conditions" do

data/spec/sql_inspections/contains_sql_queries_spec.rb

@@ -3,14 +3,14 @@
 require "spec_helper"
 
 RSpec.describe "Contains SQL Queries" do
-  let(:contains_array_regex)      { /\"users\"\.\"tag_ids\" @> '\{1,2\}'/ }
-  let(:contains_hstore_regex)     { /\"users\"\.\"data\" @> '\"nickname\"=>"Dan"'/ }
-  let(:contains_jsonb_regex)      { /\"users\"\.\"jsonb_data\" @> '\{"nickname\":\"Dan"}'/ }
-  let(:contained_in_array_regex)  { /\"users\"\.\"tag_ids\" <@ '\{1,2\}'/ }
-  let(:contained_in_hstore_regex) { /\"users\"\.\"data\" <@ '\"nickname\"=>"Dan"'/ }
-  let(:contained_in_jsonb_regex) { /\"users\"\.\"jsonb_data\" <@ '\{"nickname\":\"Dan"}'/ }
-  let(:contains_equals_regex)     { /\"users\"\.\"ip\" >>= '127.0.0.1'/ }
-  let(:equality_regex)            { /\"users\"\.\"tags\" = '\{"?working"?\}'/ }
+  let(:contains_array_regex)      { /"users"\."tag_ids" @> '\{1,2\}'/ }
+  let(:contains_hstore_regex)     { /"users"\."data" @> '"nickname"=>"Dan"'/ }
+  let(:contains_jsonb_regex)      { /"users"\."jsonb_data" @> '\{"nickname":"Dan"}'/ }
+  let(:contained_in_array_regex)  { /"users"\."tag_ids" <@ '\{1,2\}'/ }
+  let(:contained_in_hstore_regex) { /"users"\."data" <@ '"nickname"=>"Dan"'/ }
+  let(:contained_in_jsonb_regex) { /"users"\."jsonb_data" <@ '\{"nickname":"Dan"}'/ }
+  let(:contains_equals_regex)     { /"users"\."ip" >>= '127.0.0.1'/ }
+  let(:equality_regex)            { /"users"\."tags" = '\{"?working"?\}'/ }
 
   describe ".where.contains(:column => value)" do
     it "generates the appropriate where clause for array columns" do

data/spec/sql_inspections/either_sql_spec.rb

@@ -3,9 +3,9 @@
 require "spec_helper"
 
 RSpec.describe "Either Methods SQL Queries" do
-  let(:contains_array_regex) { /\"users\"\.\"tag_ids\" @> '\{1,2\}'/ }
-  let(:profile_l_outer_join) { /LEFT OUTER JOIN \"profile_ls\" ON \"profile_ls\".\"user_id\" = \"users\".\"id\"/ }
-  let(:profile_r_outer_join) { /LEFT OUTER JOIN \"profile_rs\" ON \"profile_rs\".\"user_id\" = \"users\".\"id\"/ }
+  let(:contains_array_regex) { /"users"\."tag_ids" @> '\{1,2\}'/ }
+  let(:profile_l_outer_join) { /LEFT OUTER JOIN "profile_ls" ON "profile_ls"."user_id" = "users"."id"/ }
+  let(:profile_r_outer_join) { /LEFT OUTER JOIN "profile_rs" ON "profile_rs"."user_id" = "users"."id"/ }
   let(:where_join_case) do
     "WHERE ((CASE WHEN profile_ls.user_id IS NULL"\
     " THEN profile_rs.user_id"\

data/spec/sql_inspections/json_sql_spec.rb

@@ -27,7 +27,6 @@ RSpec.describe "JSON Methods SQL Queries" do
     context "When adding cast_with: option" do
       it "should wrap the row_to_json expression with to_jsonb" do
         query = User.select_row_to_json(User.where(id: 10), cast_with: :to_jsonb, key: :convert_this, as: :results).to_sql
-        puts query
         expect(query).to match_regex(/SELECT \(SELECT TO_JSONB\(ROW_TO_JSON\("convert_this"\)\) FROM \(.+\).+\) AS "results"/)
       end
 

data/spec/sql_inspections/unionize_sql_spec.rb

@@ -74,7 +74,7 @@ RSpec.describe "Union SQL Queries" do
 
       it "should alias the union from clause to 'happy_users'" do
         expect(described_method).to match_regex(/FROM \(+.+\) UNION \(.+\)+ happy_users$/)
-        expect(described_method).to match_regex(/^SELECT happy_users\.id FROM.+happy_users$/)
+        expect(described_method).to match_regex(/^SELECT (happy_users\.id|"happy_users"\."id") FROM.+happy_users$/)
       end
     end
 
@@ -83,7 +83,7 @@ RSpec.describe "Union SQL Queries" do
 
       it "should retain the actual class calling table name as the union alias" do
         expect(described_method).to match_regex(/FROM \(+.+\) UNION \(.+\)+ users$/)
-        expect(described_method).to match_regex(/^SELECT \"users\"\.\"id\" FROM.+users$/)
+        expect(described_method).to match_regex(/^SELECT "users"\."id" FROM.+users$/)
       end
     end
   end

data/spec/sql_inspections/window_sql_spec.rb

@@ -82,5 +82,17 @@ RSpec.describe "Active Record WINDOW Query inspection" do
         end
       end
     end
+
+    context "when not providing a partition by value" do
+      it "should construct a window function" do
+        query =
+          Tag
+          .define_window(:no_args).partition_by(order_by: { tag_number: :desc })
+          .select_window(:row_number, over: :no_args, as: :my_row)
+          .to_sql
+
+        expect(query).to eq("SELECT (ROW_NUMBER() OVER no_args) AS \"my_row\" FROM \"tags\" WINDOW no_args AS (ORDER BY tag_number DESC)")
+      end
+    end
   end
 end

data/spec/sql_inspections/with_cte_sql_spec.rb

@@ -21,6 +21,20 @@ RSpec.describe "Active Record WITH CTE tables" do
     expect(query).to match_regex(with_personal_query)
   end
 
+  it "will pipe Children CTE's into the Parent relation" do
+    personal_id_one_query = User.where(personal_id: 1)
+    personal_id_two_query = User.where(personal_id: 2)
+
+    sub_query       = personal_id_two_query.with(personal_id_one: personal_id_one_query)
+    query           = User.all.with(personal_id_two: sub_query)
+    expected_order  = User.with(
+      personal_id_one: personal_id_one_query,
+      personal_id_two: personal_id_two_query
+    )
+
+    expect(query.to_sql).to eq(expected_order.to_sql)
+  end
+
   context "when multiple CTE's" do
     let(:chained_with) do
       User.with(personal_id_one: User.where(personal_id: 1))
@@ -36,6 +50,7 @@ RSpec.describe "Active Record WITH CTE tables" do
           .joins("JOIN personal_id_two ON personal_id_two.id = users.id")
           .to_sql
     end
+
     it "Should only contain a single WITH statement" do
       expect(with_arguments.scan(/WITH/).count).to eq(1)
       expect(with_arguments.scan(/AS/).count).to eq(2)
@@ -60,7 +75,21 @@ RSpec.describe "Active Record WITH CTE tables" do
     end
 
     it "generates an expression with recursive" do
-      expect(with_recursive).to match_regex(with_recursive_personal_query)
+      query = User.with
+                  .recursive(personal_id_one: User.where(personal_id: 1))
+                  .joins("JOIN personal_id_one ON personal_id_one.id = users.id")
+                  .to_sql
+
+      expect(query).to match_regex(with_recursive_personal_query)
+    end
+
+    it "will maintain the CTE table when merging" do
+      sub_query = User.with.recursive(personal_id_one: User.where(personal_id: 1))
+      query     = User.merge(sub_query)
+                      .joins("JOIN personal_id_one ON personal_id_one.id = users.id")
+                      .to_sql
+
+      expect(query).to match_regex(with_recursive_personal_query)
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - George Protacio-Karaszi
 - Dan McClain
 - Olivier El Mekki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: ar_outer_joins
   requirement: !ruby/object:Gem::Requirement
@@ -52,14 +52,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '1.16'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '1.16'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
   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
@@ -153,9 +153,8 @@ files:
 - lib/active_record_extended/arel/aggregate_function_name.rb
 - lib/active_record_extended/arel/nodes.rb
 - lib/active_record_extended/arel/predications.rb
+- lib/active_record_extended/arel/sql_literal.rb
 - lib/active_record_extended/arel/visitors/postgresql_decorator.rb
-- lib/active_record_extended/patch/5_0/predicate_builder_decorator.rb
-- lib/active_record_extended/patch/5_0/regex_match.rb
 - lib/active_record_extended/patch/5_1/where_clause.rb
 - lib/active_record_extended/patch/5_2/where_clause.rb
 - lib/active_record_extended/predicate_builder/array_handler_decorator.rb
@@ -199,7 +198,7 @@ homepage: https://github.com/georgekaraszi/ActiveRecordExtended
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -207,16 +206,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Adds extended functionality to Activerecord Postgres implementation
 test_files:

data/lib/active_record_extended/patch/5_0/predicate_builder_decorator.rb

@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-# Stripped from Rails 5.1.x
-# This patch is used so that when querying with hash elements that do not belong to an association,
-# but instead a data attribute. It returns the corrected attribute binds back to the query builder.
-#
-# Without joins
-# Before:
-#   User.where.contains(data: { nickname: "george" })
-#     #=> "SELECT \"people\".* FROM \"people\" WHERE (\"data\".\"nickname\" @> 'george')"
-#
-# After:
-#  User.where.contains(data: { nickname: "george" })
-#   #=> "SELECT \"people\".* FROM \"people\" WHERE (\"people\".\"data\" @> '\"nickname\"=>\"george\"')"
-#
-# With Joins
-# Before:
-#   Tag.joins(:user).where.contains(people: { data: { nickname: "george" } })
-#   #=> NoMethodError: undefined method `type' for nil:NilClass
-#
-# After:
-#  Tag.joins(:user).where.contains(people: { data: { nickname: "george" } })
-#  #=> "SELECT \"tags\".* FROM \"tags\" INNER JOIN \"people\" ON \"people\".\"id\" = \"tags\".\"person_id\"
-#         WHERE (\"people\".\"data\" @> '\"nickname\"=>\"george\"')"
-#
-module ActiveRecord
-  class TableMetadata
-    def has_column?(column_name) # rubocop:disable Naming/PredicateName
-      klass&.columns_hash&.key?(column_name.to_s)
-    end
-  end
-
-  class PredicateBuilder
-    def create_binds_for_hash(attributes) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
-      result = attributes.dup
-      binds = []
-
-      attributes.each do |column_name, value| # rubocop:disable Metrics/BlockLength
-        if value.is_a?(Hash) && !table.has_column?(column_name)
-          attrs, bvs = associated_predicate_builder(column_name).create_binds_for_hash(value)
-          result[column_name] = attrs
-          binds += bvs
-          next
-        elsif value.is_a?(Relation)
-          binds += value.bound_attributes
-        elsif value.is_a?(Range) && !table.type(column_name).respond_to?(:subtype)
-          first = value.begin
-          last = value.end
-          unless first.respond_to?(:infinite?) && first.infinite?
-            binds << build_bind_param(column_name, first)
-            first = Arel::Nodes::BindParam.new
-          end
-          unless last.respond_to?(:infinite?) && last.infinite?
-            binds << build_bind_param(column_name, last)
-            last = Arel::Nodes::BindParam.new
-          end
-
-          result[column_name] = RangeHandler::RangeWithBinds.new(first, last, value.exclude_end?)
-        elsif can_be_bound?(column_name, value)
-          result[column_name] = Arel::Nodes::BindParam.new
-          binds << build_bind_param(column_name, value)
-        end
-
-        # Find the foreign key when using queries such as:
-        # Post.where(author: author)
-        #
-        # For polymorphic relationships, find the foreign key and type:
-        # PriceEstimate.where(estimate_of: treasure)
-        if table.associated_with?(column_name)
-          result[column_name] = AssociationQueryHandler.value_for(table, column_name, value)
-        end
-      end
-
-      [result, binds]
-    end
-
-    def can_be_bound?(column_name, value)
-      return if table.associated_with?(column_name)
-      case value
-      when Array, Range
-        table.type(column_name).respond_to?(:subtype)
-      else
-        !value.nil? && handler_for(value).is_a?(BasicObjectHandler)
-      end
-    end
-  end
-end

data/lib/active_record_extended/patch/5_0/regex_match.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class Regexp
-  # Stripped from ActiveSupport v5.1
-  unless //.respond_to?(:match?)
-    def match?(string, pos = 0)
-      !(!match(string, pos))
-    end
-  end
-end