active_record_extended 1.2.0 → 2.0.3

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"\
@@ -31,6 +31,22 @@ RSpec.describe "Either Methods SQL Queries" do
       query = User.either_join(:profile_l, :profile_r).to_sql
       expect(query).to include(where_join_case)
     end
+
+    context "Through association .either_joins/2" do
+      let!(:four) { User.create! }
+      let!(:group) { Group.create!(users: [four]) }
+      let(:where_join_through_case) do
+        "WHERE ((CASE WHEN profile_ls.user_id IS NULL"\
+        " THEN groups_users.user_id"\
+        " ELSE profile_ls.user_id END) "\
+        "= users.id)"
+      end
+
+      it "Should contain a case statement that will conditionally alternative between tables" do
+        query = User.either_join(:profile_l, :groups).to_sql
+        expect(query).to include(where_join_through_case)
+      end
+    end
   end
 
   describe ".either_order/2" do

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
 
@@ -53,6 +52,13 @@ RSpec.describe "JSON Methods SQL Queries" do
         end
       end
     end
+
+    context "when the subquery is a STI record type" do
+      it "should not append sti 'type IN(..)' where clauses to the nested query" do
+        query = User.select_row_to_json(AdminSti.where(id: 10), cast_with: :array, key: :convert_this, as: :results).to_sql
+        expect(query).to match_regex(/SELECT \(ARRAY\(SELECT ROW_TO_JSON\("convert_this"\) FROM \(.*\) convert_this\)\) AS .+/)
+      end
+    end
   end
 
   describe ".json_build_object" do

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

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Active Record WINDOW Query inspection" do
+  describe "#define_window" do
+    context "when there is a single defined window" do
+      it "should only contain a single defined window statement at the bottom" do
+        query = Tag.define_window(:w_test).partition_by(:user_id).to_sql
+        expect(query).to eq('SELECT "tags".* FROM "tags" WINDOW w_test AS (PARTITION BY user_id)')
+      end
+
+      it "should return a single defined window with a defined ORDER BY" do
+        query = Tag.define_window(:w_test).partition_by(:user_id, order_by: { tags: { user_id: :desc } }).to_sql
+        expect(query).to end_with("WINDOW w_test AS (PARTITION BY user_id ORDER BY tags.user_id DESC)")
+      end
+
+      it "should place the window function below the WHERE and GROUP BY statements" do
+        query = Tag.define_window(:w_test).partition_by(:user_id).where(id: 1).group(:user_id).to_sql
+        expect(query).to eq('SELECT "tags".* FROM "tags" WHERE "tags"."id" = 1 GROUP BY "tags"."user_id" WINDOW w_test AS (PARTITION BY user_id)')
+      end
+    end
+
+    context "when there are multiple defined windows" do
+      it "should only contain a single defined window statement at the bottom" do
+        query =
+          Tag
+          .define_window(:test).partition_by(:user_id)
+          .define_window(:other_window).partition_by(:id)
+          .to_sql
+
+        expect(query).to end_with("WINDOW test AS (PARTITION BY user_id), other_window AS (PARTITION BY id)")
+      end
+
+      it "should contain each windows order by statements" do
+        query =
+          Tag
+          .define_window(:test).partition_by(:user_id, order_by: :id)
+          .define_window(:other_window).partition_by(:id, order_by: { tags: :user_id })
+          .to_sql
+
+        expect(query).to end_with("WINDOW test AS (PARTITION BY user_id ORDER BY id), other_window AS (PARTITION BY id ORDER BY tags.user_id ASC)")
+      end
+    end
+  end
+
+  describe "#window_select" do
+    let(:query_base)   { Tag.define_window(:w).partition_by(:user_id, order_by: :id) }
+    let(:expected_end) { "WINDOW w AS (PARTITION BY user_id ORDER BY id)" }
+
+    context "when using no argument window methods" do
+      [:row_to_number, :rank, :dense_rank, :percent_rank, :cume_dist].each do |window_function|
+        context "#{window_function.to_s.upcase}()" do
+          let(:expected_function) { "#{window_function.to_s.upcase}()" }
+          let(:query) do
+            query_base.select_window(window_function, over: :w, as: :window_response).to_sql
+          end
+
+          it "appends the function to the select query" do
+            expected_start = "SELECT (#{expected_function} OVER w) AS \"window_response\""
+            expect(query).to start_with(expected_start).and(end_with(expected_end))
+          end
+        end
+      end
+    end
+
+    context "when using an argument based window method" do
+      let(:argument_list) { ["a", 1, :sauce] }
+
+      { ntile: 1, lag: 2, lead: 3, first_value: 1, last_value: 1, nth_value: 2 }.each_pair do |window_function, arg_count|
+        context "#{window_function.to_s.upcase}/#{arg_count}" do
+          let(:arguments)         { argument_list.first(arg_count) }
+          let(:expected_function) { "#{window_function.to_s.upcase}(#{arguments.join(', ')})" }
+          let(:query) do
+            query_base.select_window(window_function, *arguments, over: :w, as: :window_response).to_sql
+          end
+
+          it "appends the function to the select query" do
+            expected_start = "SELECT (#{expected_function} OVER w) AS \"window_response\""
+            expect(query).to start_with(expected_start).and(end_with(expected_end))
+          end
+        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

data/spec/support/models.rb

@@ -5,6 +5,8 @@ class ApplicationRecord < ActiveRecord::Base
 end
 
 class User < ApplicationRecord
+  has_many :groups_users, class_name: "GroupsUser"
+  has_many :groups, through: :groups_users, dependent: :destroy
   has_many :hm_tags, class_name: "Tag"
   has_one :profile_l, class_name: "ProfileL"
   has_one :profile_r, class_name: "ProfileR"
@@ -20,6 +22,12 @@ class User < ApplicationRecord
   #
 end
 
+class StiRecord < ApplicationRecord
+  # t.string "type"
+end
+
+class AdminSti < StiRecord; end
+
 module Namespaced
   def self.table_name_prefix
     "namespaced_"
@@ -60,3 +68,13 @@ class VersionControl < ApplicationRecord
   # t.jsonb :source, default: {}, null: false
   #
 end
+
+class Group < ApplicationRecord
+  has_many :groups_users, class_name: "GroupsUser"
+  has_many :users, through: :groups_users, dependent: :destroy
+end
+
+class GroupsUser < ApplicationRecord
+  belongs_to :user
+  belongs_to :group
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.3
 platform: ruby
 authors:
 - George Protacio-Karaszi
 - Dan McClain
 - Olivier El Mekki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-11 00:00:00.000000000 Z
+date: 2021-06-25 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
@@ -166,6 +165,7 @@ files:
 - lib/active_record_extended/query_methods/select.rb
 - lib/active_record_extended/query_methods/unionize.rb
 - lib/active_record_extended/query_methods/where_chain.rb
+- lib/active_record_extended/query_methods/window.rb
 - lib/active_record_extended/query_methods/with_cte.rb
 - lib/active_record_extended/utilities/order_by.rb
 - lib/active_record_extended/utilities/support.rb
@@ -179,6 +179,7 @@ files:
 - spec/query_methods/json_spec.rb
 - spec/query_methods/select_spec.rb
 - spec/query_methods/unionize_spec.rb
+- spec/query_methods/window_spec.rb
 - spec/query_methods/with_cte_spec.rb
 - spec/spec_helper.rb
 - spec/sql_inspections/any_of_sql_spec.rb
@@ -189,6 +190,7 @@ files:
 - spec/sql_inspections/either_sql_spec.rb
 - spec/sql_inspections/json_sql_spec.rb
 - spec/sql_inspections/unionize_sql_spec.rb
+- spec/sql_inspections/window_sql_spec.rb
 - spec/sql_inspections/with_cte_sql_spec.rb
 - spec/support/database_cleaner.rb
 - spec/support/models.rb
@@ -196,7 +198,7 @@ homepage: https://github.com/georgekaraszi/ActiveRecordExtended
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,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:
@@ -226,6 +227,7 @@ test_files:
 - spec/query_methods/json_spec.rb
 - spec/query_methods/select_spec.rb
 - spec/query_methods/unionize_spec.rb
+- spec/query_methods/window_spec.rb
 - spec/query_methods/with_cte_spec.rb
 - spec/spec_helper.rb
 - spec/sql_inspections/any_of_sql_spec.rb
@@ -236,6 +238,7 @@ test_files:
 - spec/sql_inspections/either_sql_spec.rb
 - spec/sql_inspections/json_sql_spec.rb
 - spec/sql_inspections/unionize_sql_spec.rb
+- spec/sql_inspections/window_sql_spec.rb
 - spec/sql_inspections/with_cte_sql_spec.rb
 - spec/support/database_cleaner.rb
 - spec/support/models.rb