active_record_extended 1.1.0 → 2.0.0

data/spec/sql_inspections/with_cte_sql_spec.rb

@@ -3,39 +3,54 @@
 require "spec_helper"
 
 RSpec.describe "Active Record WITH CTE tables" do
-  let(:with_personal_query) { /WITH.+personal_id_one.+AS \(SELECT.+people.+FROM.+WHERE.+people.+personal_id.+ = 1\)/ }
+  let(:with_personal_query) { /WITH.+personal_id_one.+AS \(SELECT.+users.+FROM.+WHERE.+users.+personal_id.+ = 1\)/ }
 
   it "should contain WITH statement that creates the CTE table" do
-    query = Person.with(personal_id_one: Person.where(personal_id: 1))
-                  .joins("JOIN personal_id_one ON personal_id_one.id = people.id")
-                  .to_sql
+    query = User.with(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_personal_query)
   end
 
   it "will maintain the CTE table when merging" do
-    query = Person.all
-                  .merge(Person.with(personal_id_one: Person.where(personal_id: 1)))
-                  .joins("JOIN personal_id_one ON personal_id_one.id = people.id")
-                  .to_sql
+    query = User.all
+                .merge(User.with(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_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
-      Person.with(personal_id_one: Person.where(personal_id: 1))
-            .with(personal_id_two: Person.where(personal_id: 2))
-            .joins("JOIN personal_id_one ON personal_id_one.id = people.id")
-            .joins("JOIN personal_id_two ON personal_id_two.id = people.id")
-            .to_sql
+      User.with(personal_id_one: User.where(personal_id: 1))
+          .with(personal_id_two: User.where(personal_id: 2))
+          .joins("JOIN personal_id_one ON personal_id_one.id = users.id")
+          .joins("JOIN personal_id_two ON personal_id_two.id = users.id")
+          .to_sql
     end
 
     let(:with_arguments) do
-      Person.with(personal_id_one: Person.where(personal_id: 1), personal_id_two: Person.where(personal_id: 2))
-            .joins("JOIN personal_id_one ON personal_id_one.id = people.id")
-            .joins("JOIN personal_id_two ON personal_id_two.id = people.id")
-            .to_sql
+      User.with(personal_id_one: User.where(personal_id: 1), personal_id_two: User.where(personal_id: 2))
+          .joins("JOIN personal_id_one ON personal_id_one.id = users.id")
+          .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)
@@ -49,18 +64,32 @@ RSpec.describe "Active Record WITH CTE tables" do
 
   context "when chaining the recursive method" do
     let(:with_recursive_personal_query) do
-      /WITH.+RECURSIVE.+personal_id_one.+AS \(SELECT.+people.+FROM.+WHERE.+people.+personal_id.+ = 1\)/
+      /WITH.+RECURSIVE.+personal_id_one.+AS \(SELECT.+users.+FROM.+WHERE.+users.+personal_id.+ = 1\)/
     end
 
     let(:with_recursive) do
-      Person.with
-            .recursive(personal_id_one: Person.where(personal_id: 1))
-            .joins("JOIN personal_id_one ON personal_id_one.id = people.id")
-            .to_sql
+      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
     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

@@ -4,13 +4,14 @@ class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end
 
-class Person < ApplicationRecord
+class User < ApplicationRecord
   has_many :hm_tags, class_name: "Tag"
   has_one :profile_l, class_name: "ProfileL"
   has_one :profile_r, class_name: "ProfileR"
   # attributes
   # t.string   "tags",         array: true
   # t.integer  "number",       default: 0
+  # t.string   "name"
   # t.integer  "personal_id"
   # t.hstore   "data"
   # t.jsonb    "jsonb_data"
@@ -19,13 +20,32 @@ class Person < ApplicationRecord
   #
 end
 
+class StiRecord < ApplicationRecord
+  # t.string "type"
+end
+
+class AdminSti < StiRecord; end
+
+module Namespaced
+  def self.table_name_prefix
+    "namespaced_"
+  end
+
+  class Record < ApplicationRecord
+    # attributes
+    # t.inet :ip
+    # t.cidr :subnet
+    #
+  end
+end
+
 class Tag < ApplicationRecord
-  belongs_to :person
+  belongs_to :user
   # attributes: tag_number
 end
 
 class ProfileL < ApplicationRecord
-  belongs_to :person
+  belongs_to :user
   has_one :version, as: :versionable, class_name: "VersionControl"
   # attributes
   # t.integer :likes
@@ -33,7 +53,7 @@ class ProfileL < ApplicationRecord
 end
 
 class ProfileR < ApplicationRecord
-  belongs_to :person
+  belongs_to :user
   has_one :version, as: :versionable, class_name: "VersionControl"
   # attributes
   # t.integer :dislikes

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - George Protacio-Karaszi
 - Dan McClain
 - Olivier El Mekki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-04 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
@@ -150,10 +150,11 @@ files:
 - lib/active_record_extended/active_record.rb
 - lib/active_record_extended/active_record/relation_patch.rb
 - lib/active_record_extended/arel.rb
+- 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_1/where_clause.rb
 - lib/active_record_extended/patch/5_2/where_clause.rb
 - lib/active_record_extended/predicate_builder/array_handler_decorator.rb
@@ -161,10 +162,13 @@ files:
 - lib/active_record_extended/query_methods/either.rb
 - lib/active_record_extended/query_methods/inet.rb
 - lib/active_record_extended/query_methods/json.rb
+- 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.rb
+- lib/active_record_extended/utilities/order_by.rb
+- lib/active_record_extended/utilities/support.rb
 - lib/active_record_extended/version.rb
 - spec/active_record_extended_spec.rb
 - spec/query_methods/any_of_spec.rb
@@ -173,16 +177,20 @@ files:
 - spec/query_methods/hash_query_spec.rb
 - spec/query_methods/inet_query_spec.rb
 - 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
+- spec/sql_inspections/arel/aggregate_function_name_spec.rb
 - spec/sql_inspections/arel/array_spec.rb
 - spec/sql_inspections/arel/inet_spec.rb
 - spec/sql_inspections/contains_sql_queries_spec.rb
 - 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
@@ -190,7 +198,7 @@ homepage: https://github.com/georgekaraszi/ActiveRecordExtended
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,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:
@@ -218,16 +225,20 @@ test_files:
 - spec/query_methods/hash_query_spec.rb
 - spec/query_methods/inet_query_spec.rb
 - 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
+- spec/sql_inspections/arel/aggregate_function_name_spec.rb
 - spec/sql_inspections/arel/array_spec.rb
 - spec/sql_inspections/arel/inet_spec.rb
 - spec/sql_inspections/contains_sql_queries_spec.rb
 - 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

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:
-#   Person.where.contains(data: { nickname: "george" })
-#     #=> "SELECT \"people\".* FROM \"people\" WHERE (\"data\".\"nickname\" @> 'george')"
-#
-# After:
-#  Person.where.contains(data: { nickname: "george" })
-#   #=> "SELECT \"people\".* FROM \"people\" WHERE (\"people\".\"data\" @> '\"nickname\"=>\"george\"')"
-#
-# With Joins
-# Before:
-#   Tag.joins(:person).where.contains(people: { data: { nickname: "george" } })
-#   #=> NoMethodError: undefined method `type' for nil:NilClass
-#
-# After:
-#  Tag.joins(:person).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/utilities.rb

@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecordExtended
-  module Utilities
-    A_TO_Z_KEYS = ("a".."z").to_a.freeze
-
-    # We need to ensure we can flatten nested ActiveRecord::Relations
-    # that might have been nested due to the (splat)*args parameters
-    #
-    # Note: calling `Array.flatten[!]/1` will actually remove all AR relations from the array.
-    #
-    def flatten_to_sql(*values)
-      flatten_safely(values) do |value|
-        value = yield value if block_given?
-        to_arel_sql(value)
-      end
-    end
-    alias to_sql_array flatten_to_sql
-
-    def flatten_safely(values, &block)
-      unless values.is_a?(Array)
-        values = yield values if block_given?
-        return [values]
-      end
-
-      values.map { |value| flatten_safely(value, &block) }.reduce(:+)
-    end
-
-    # Applies aliases to the given query
-    # Ex: `SELECT * FROM users` => `(SELECT * FROM users) AS "members"`
-    def nested_alias_escape(query, alias_name)
-      sql_query = Arel::Nodes::Grouping.new(to_arel_sql(query))
-      Arel::Nodes::As.new(sql_query, to_arel_sql(double_quote(alias_name)))
-    end
-
-    # Wraps subquery into an Aliased ARRAY
-    # Ex: `SELECT * FROM users` => (ARRAY(SELECT * FROM users)) AS "members"
-    def wrap_with_array(arel_or_rel_query, alias_name)
-      query = Arel::Nodes::NamedFunction.new("ARRAY", to_sql_array(arel_or_rel_query))
-      nested_alias_escape(query, alias_name)
-    end
-
-    # Will attempt to digest and resolve the from clause
-    #
-    # If the from clause is a String, it will check to see if a table reference key has been assigned.
-    #   - If one cannot be detected, one will be appended.
-    #   - Rails does not allow assigning table references using the `.from/2` method, when its a string / sym type.
-    #
-    # If the from clause is an AR relation; it will duplicate the object.
-    #   - Ensures any memorizers are reset (ex: `.to_sql` sets a memorizer on the instance)
-    #   - Key's can be assigned using the `.from/2` method.
-    #
-    def from_clause_constructor(from, reference_key)
-      case from
-      when /\s.?#{reference_key}.?$/ # The from clause is a string and has the tbl reference key
-        @scope.unscoped.from(from)
-      when String, Symbol
-        @scope.unscoped.from("#{from} #{reference_key}")
-      else
-        replicate_klass = from.respond_to?(:unscoped) ? from.unscoped : @scope.unscoped
-        replicate_klass.from(from.dup, reference_key)
-      end
-    end
-
-    # Will carry defined CTE tables from the nested sub-query and gradually pushes it up to the parents query stack
-    # I.E: It pushes `WITH [:cte_name:] AS(...), ..` to the top of the query structure tree
-    #
-    # SPECIAL GOTCHA NOTE: (if duplicate keys are found) This will favor the parents query `with's` over nested ones!
-    def pipe_cte_with!(subquery)
-      return self unless subquery.try(:with_values?)
-
-      cte_ary              = flatten_safely(subquery.with_values)
-      subquery.with_values = nil # Remove nested queries with values
-
-      # Add subquery's CTE's to the parents query stack. (READ THE SPECIAL NOTE ABOVE!)
-      if @scope.with_values?
-        # combine top-level and lower level queries `.with` values into 1 structure
-        with_hash = cte_ary.each_with_object(@scope.with_values.first) do |from_cte, hash|
-          hash.reverse_merge!(from_cte)
-        end
-
-        @scope.with_values = [with_hash]
-      else
-        # Top level has no with values
-        @scope.with!(*cte_ary)
-      end
-
-      self
-    end
-
-    # Ensures the given value is properly double quoted.
-    # This also ensures we don't have conflicts with reversed keywords.
-    #
-    # IE: `user` is a reserved keyword in PG. But `"user"` is allowed and works the same
-    #     when used as an column/tbl alias.
-    def double_quote(value)
-      return if value.nil?
-
-      case value.to_s
-      when "*", /^".+"$/ # Ignore keys that contain double quotes or a Arel.star (*)[all columns]
-        value
-      else
-        PG::Connection.quote_ident(value.to_s)
-      end
-    end
-
-    # Ensures the key is properly single quoted and treated as a actual PG key reference.
-    def literal_key(key)
-      case key
-      when TrueClass  then "'t'"
-      when FalseClass then "'f'"
-      when Numeric    then key
-      else
-        key = key.to_s
-        key.start_with?("'") && key.end_with?("'") ? key : "'#{key}'"
-      end
-    end
-
-    # Converts a potential subquery into a compatible Arel SQL node.
-    #
-    # Note:
-    # We convert relations to SQL to maintain compatibility with Rails 5.[0/1].
-    # Only Rails 5.2+ maintains bound attributes in Arel, so its better to be safe then sorry.
-    # When we drop support for Rails 5.[0/1], we then can then drop the '.to_sql' conversation
-
-    def to_arel_sql(value)
-      case value
-      when Arel::Node, Arel::Nodes::SqlLiteral, nil
-        value
-      when ActiveRecord::Relation
-        Arel.sql(value.spawn.to_sql)
-      else
-        Arel.sql(value.respond_to?(:to_sql) ? value.to_sql : value.to_s)
-      end
-    end
-
-    def key_generator
-      A_TO_Z_KEYS.sample
-    end
-  end
-end