arel_extensions 2.0.22 → 2.1.1

data/lib/arel_extensions.rb

@@ -34,9 +34,9 @@ class Arel::Nodes::Grouping
 end
 
 class Arel::Nodes::Ordering
-	def eql? other
-		self.hash.eql? other.hash
-	end
+  def eql? other
+    self.hash.eql? other.hash
+  end
 end
 
 class Arel::Nodes::Function
@@ -52,6 +52,7 @@ if Gem::Version.new(Arel::VERSION) >= Gem::Version.new("7.1.0")
 end
 
 require 'arel_extensions/version'
+require 'arel_extensions/aliases'
 require 'arel_extensions/attributes'
 require 'arel_extensions/visitors'
 require 'arel_extensions/nodes'
@@ -76,7 +77,17 @@ require 'arel_extensions/nodes/soundex'
 require 'arel_extensions/nodes/cast'
 require 'arel_extensions/nodes/json'
 
-
+# It seems like the code in lib/arel_extensions/visitors.rb that is supposed
+# to inject ArelExtension is not enough. Different versions of the sqlserver
+# adapter behave differently. It doesn't always proc, so we added this for
+# coverage.
+if defined?(Arel::Visitors::SQLServer)
+  Arel::Visitors.const_set('MSSQL', Arel::Visitors::SQLServer)
+  require 'arel_extensions/visitors/mssql'
+  class Arel::Visitors::SQLServer
+    include ArelExtensions::Visitors::MSSQL
+  end
+end
 
 module Arel
   def self.rand
@@ -88,11 +99,13 @@ module Arel
   end
 
   def self.json *expr
-    if expr.length == 1
-      ArelExtensions::Nodes::Json.new(expr.first)
-    else
-      ArelExtensions::Nodes::Json.new(expr)
-    end
+    ArelExtensions::Nodes::Json.new(
+      if expr.length == 1
+        expr.first
+      else
+        expr
+      end
+    )
   end
 
   def self.when condition
@@ -100,20 +113,31 @@ module Arel
   end
 
   def self.duration s, expr
-    ArelExtensions::Nodes::Duration.new(s.to_s+'i',expr)
+    ArelExtensions::Nodes::Duration.new("#{s}i", expr)
   end
 
+  def self.grouping *v
+    Arel::Nodes::Grouping.new(*v)
+  end
+
+  # The TRUE pseudo literal.
   def self.true
-    Arel::Nodes::Equality.new(1,1)
+    Arel::Nodes::Equality.new(1, 1)
   end
 
+  # The FALSE pseudo literal.
   def self.false
-    Arel::Nodes::Equality.new(1,0)
+    Arel::Nodes::Equality.new(1, 0)
+  end
+
+  # The NULL literal.
+  def self.null
+    Arel::Nodes.build_quoted(nil)
   end
 
   def self.tuple *v
-    tmp = Arel::Nodes::Grouping.new(nil)
-    Arel::Nodes::Grouping.new(v.map{|e| tmp.convert_to_node(e)})
+    tmp = Arel.grouping(nil)
+    Arel.grouping v.map{|e| tmp.convert_to_node(e)}
   end
 end
 
@@ -123,6 +147,7 @@ class Arel::Attributes::Attribute
 end
 
 class Arel::Nodes::Function
+  include ArelExtensions::Aliases
   include ArelExtensions::Math
   include ArelExtensions::Comparators
   include ArelExtensions::DateDuration
@@ -189,6 +214,19 @@ end
 class Arel::SelectManager
   include ArelExtensions::SetFunctions
   include ArelExtensions::Nodes
+
+  def as table_name
+    Arel::Nodes::TableAlias.new(self, table_name)
+  end
+
+  # Install an alias, if present.
+  def xas table_name
+    if table_name.present?
+      as table_name
+    else
+      self
+    end
+  end
 end
 
 class Arel::Nodes::As
@@ -198,7 +236,11 @@ end
 class Arel::Table
   alias_method(:old_alias, :alias) rescue nil
   def alias(name = "#{self.name}_2")
-    name.blank? ? self : Arel::Nodes::TableAlias.new(self,name)
+    if name.present?
+      Arel::Nodes::TableAlias.new(self, name)
+    else
+      self
+    end
   end
 end
 

data/test/arelx_test_helper.rb

@@ -6,6 +6,51 @@ require 'active_record'
 
 require 'support/fake_record'
 
+def colored(color, msg)
+  ENV["TERM"] =~ /^xterm|-256color$/ ? "\x1b[#{color}m#{msg}\x1b[89m\x1b[0m"  : "#{msg}"
+end
+
+YELLOW = "33"
+
+def warn(msg)
+  $stderr.puts(colored(YELLOW, msg))
+end
+
+# Load gems specific to databases
+# NOTE:
+#     It's strongly advised to test each database on its own. Loading multiple
+#     backend gems leads to undefined behavior according to tests; the backend
+#     might not recognize the correct DB visitor and will fallback to `ToSQL`
+#     and screw all tests.
+#
+#     The issue also seems to be related to arel version: at some point, arel
+#     dropped its wide support for DBs and kept Postgres, MySQL and SQLite.
+#     Here, we're just trying to load the correct ones.
+db_and_gem =  if RUBY_ENGINE == 'jruby'
+                {
+                  'oracle'     => 'activerecord-oracle_enhanced-adapter',
+                  'mssql'      => 'activerecord-jdbcsqlserver-adapter'
+                }
+              else
+                {
+                  'oracle'     => 'activerecord-oracle_enhanced-adapter',
+                  'mssql'      => 'activerecord-sqlserver-adapter'
+                }
+              end
+
+def load_lib(gem)
+  if gem && (RUBY_ENGINE == 'jruby' || Arel::VERSION.to_i > 9)
+    begin
+      Gem::Specification.find_by_name(gem)
+      require gem
+    rescue Gem::MissingSpecError
+      warn "Warning: failed to load gem #{gem}. Are you sure it's installed?"
+    end
+  end
+end
+
+load_lib(db_and_gem[ENV['DB']])
+
 require 'arel_extensions'
 Arel::Table.engine = FakeRecord::Base.new
 

data/test/database.yml

@@ -9,23 +9,29 @@ jdbc-sqlite:
 mysql:
   adapter: mysql2
   database: arext_test
-  username: travis
+  username: root
   host: 127.0.0.1
   port: 3306
   encoding: utf8
 jdbc-mysql:
   adapter: jdbcmysql
   database: arext_test
-  username: travis
+  username: root
   encoding: utf8
 postgresql:
   adapter: postgresql
   database: arext_test
   username: postgres
+  password: secret
+  host: 127.0.0.1
+  port: 5432
 jdbc-postgresql:
   adapter: jdbcpostgresql
   database: arext_test
   username: postgres
+  password: secret
+  host: 127.0.0.1
+  port: 5432
 oracle:
   adapter: oracle_enhanced
   database: xe

data/test/real_db_test.rb

@@ -8,7 +8,11 @@ require 'arel_extensions'
 def setup_db
   ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
   ActiveRecord::Base.establish_connection(ENV['DB'].try(:to_sym) || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-  ActiveRecord::Base.default_timezone = :utc
+  if ActiveRecord::VERSION::MAJOR >= 7
+    ActiveRecord.default_timezone = :utc
+  else
+    ActiveRecord::Base.default_timezone = :utc
+  end
   @cnx = ActiveRecord::Base.connection
   if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
     $sqlite = true

data/test/support/fake_record.rb

@@ -105,7 +105,7 @@ module FakeRecord
     attr_reader :spec, :connection
 
     def initialize
-      @spec = Spec.new(:adapter => 'america')
+      @spec = Spec.new({:adapter => 'america'})
       @connection = Connection.new
       @connection.visitor = Arel::Visitors::ToSql.new(connection)
     end

data/test/visitors/test_to_sql.rb

@@ -5,6 +5,27 @@ module ArelExtensions
   module VisitorToSql
     describe 'the to_sql visitor' do
       before do
+        if Arel::Table.engine.is_a?(ActiveRecord::Base)
+          puts "This is a hack."
+          # As a matter of fact, if the whole if-block is removed, the to_sql
+          # test become flaky.
+          #
+          # The first time `Arel::Table.engine` is called
+          # from `ArelExtenstions::column_of_via_arel_table(table_name, column_name)`
+          # in   `lib/arel_extensions/helpers.rb`
+          # will almost always fail. It's important to note that when the test
+          # fails, it's always on 1 test case, and every subsequent test that
+          # calls to these methods passes.
+          #
+          # After investigation, it turned out that `Arel::Table.engine` will be
+          # of type `ActiveRecord::Base` instead of the expected `FakeRecord::Base`
+          # as set in this `before` block, in the `@conn` instance variable.
+          # Subsequent calls to `column_of_via_arel_table` will have
+          # `Arel::Table.engine` of the expected type.
+          #
+          # It is still unclear why the call in the condition of this if-block
+          # fixes this behavior.
+        end
         @conn = FakeRecord::Base.new
         Arel::Table.engine = @conn
         @visitor = Arel::Visitors::ToSql.new @conn.connection
@@ -282,16 +303,23 @@ module ArelExtensions
           .must_be_like %{CASE "users"."name" WHEN 'smith' THEN 'cool' ELSE 'uncool' END ILIKE 'value'}
       end
 
-      it "should be possible to use as on anything" do
-        _(compile(@table[:name].as('alias'))).must_be_like %{"users"."name" AS alias}
-        _(compile(@table[:name].concat(' test').as('alias'))).must_be_like %{CONCAT("users"."name", ' test') AS alias}
-        _(compile((@table[:name] + ' test').as('alias'))).must_be_like %{CONCAT("users"."name", ' test') AS alias}
-        _(compile((@table[:age] + 42).as('alias'))).must_be_like %{("users"."age" + 42) AS alias}
-        _(compile(@table[:name].coalesce('').as('alias'))).must_be_like %{COALESCE("users"."name", '') AS alias}
-        _(compile(Arel::Nodes.build_quoted('test').as('alias'))).must_be_like %{'test' AS alias}
-        _(compile(@table.project(@table[:name]).as('alias'))).must_be_like %{(SELECT "users"."name" FROM "users") alias}
-        _(compile(@table[:name].when("smith").then("cool").else("uncool").as('alias')))
-          .must_be_like %{CASE "users"."name" WHEN 'smith' THEN 'cool' ELSE 'uncool' END AS alias}
+      it "should be possible to use as/xas on anything" do
+        {
+          @table[:name] => %{"users"."name" AS alias},
+          @table[:name].concat(' test') => %{CONCAT("users"."name", ' test') AS alias},
+          (@table[:name] + ' test') => %{CONCAT("users"."name", ' test') AS alias},
+          (@table[:age] + 42) => %{("users"."age" + 42) AS alias},
+          @table[:name].coalesce('') => %{COALESCE("users"."name", '') AS alias},
+          Arel::Nodes.build_quoted('test') => %{'test' AS alias},
+          @table.project(@table[:name]) => %{(SELECT "users"."name" FROM "users") "alias"},
+          @table[:name].when("smith").then("cool").else("uncool") => %{CASE "users"."name" WHEN 'smith' THEN 'cool' ELSE 'uncool' END AS alias},
+        }.each do |exp, res|
+          _(compile(exp.as('alias'))).must_be_like res
+          _(compile(exp.xas('alias'))).must_be_like res
+
+          res_no_alias = res.gsub(/\s*(?:AS alias|"alias")\s*\z/, '')
+          _(compile(exp.xas(nil))).must_be_like res_no_alias
+        end
       end
 
       it "should accept comparators on functions" do
@@ -373,7 +401,7 @@ module ArelExtensions
         end
 
         it "should respecting Grouping" do
-          g = ->(*v) { Arel::Nodes::Grouping.new(v) }
+          g = ->(*v) { Arel.grouping(v) }
           _(compile(g[@table[:id], @table[:age]].in [g[1, 42]]))
             .must_be_like %{("users"."id", "users"."age") IN ((1, 42))}
           _(compile(g[@table[:id], @table[:age]].in [g[1, 42], g[2, 51]]))

data/test/with_ar/all_agnostic_test.rb

@@ -2,7 +2,7 @@ require 'arelx_test_helper'
 require 'date'
 
 module ArelExtensions
-  module WthAr
+  module WithAr
     class ListTest < Minitest::Test
       require 'minitest/pride'
       def connect_db
@@ -14,7 +14,11 @@ module ArelExtensions
           @env_db = ENV['DB']
         end
         ActiveRecord::Base.establish_connection(@env_db.try(:to_sym) || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        ActiveRecord::Base.default_timezone = :utc
+        if ActiveRecord::VERSION::MAJOR >= 7
+          ActiveRecord.default_timezone = :utc
+        else
+          ActiveRecord::Base.default_timezone = :utc
+        end
         @cnx = ActiveRecord::Base.connection
         $sqlite = @cnx.adapter_name =~ /sqlite/i
         $load_extension_disabled ||= false
@@ -29,7 +33,7 @@ module ArelExtensions
           t.column :name, :string
           t.column :comments, :text
           t.column :created_at, :date
-          t.column :updated_at, :datetime
+          t.column :updated_at, :datetime, precision: nil
           t.column :duration, :time
           t.column :other, :string
           t.column :score, :decimal, :precision => 20, :scale => 10
@@ -166,6 +170,12 @@ module ArelExtensions
         # Since Arel10 (Rails6.1), some unwanted behaviors on aggregated calculation were present.
         # This should works no matter which version of rails is used
         assert User.group(:score).average(:id).values.all?{|e| !e.nil?}
+
+        # Since Rails 7, a patch to calculations.rb has tirggered a double
+        # quoting of the alias name. See https://github.com/rails/rails/commit/7e6e9091e55c3357b0162d44b6ab955ed0c718d5
+        # Before the patch that fixed this the following error would occur:
+        #   ActiveRecord::StatementInvalid: PG::SyntaxError: ERROR:  zero-length delimited identifier at or near """"
+        assert User.group(:score).count(:id).values.all?{|e| !e.nil?}
       end
 
       # String Functions
@@ -358,9 +368,70 @@ module ArelExtensions
 
       def test_format
         assert_equal '2016-05-23', t(@lucas, @created_at.format('%Y-%m-%d'))
-        skip "SQL Server does not accept any format" if @env_db == 'mssql'
         assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S'))
         assert_equal '12:42%', t(@lucas, @updated_at.format('%R%%'))
+
+        # The following tests will ensure proper conversion of timestamps to
+        # requested timezones.
+        #
+        # The names of the timezones is highly dependant on the underlying
+        # operating system, and this is why we need to handle each database
+        # separately: the images we're using to test these databases are
+        # different. So don't rely on the provided examples. Your setup is your
+        # reference.
+        #
+        # One could always have portable code if s/he uses standard
+        # abbreviations, like:
+        #
+        # 1. CET  => Central European Time
+        # 2. CEST => Central European Summer Time
+        #
+        # Which implies that the caller should handle daylight saving detection.
+        # In fact, CET will handle daylight saving in MySQL but not Postgres.
+        #
+        # It looks like the posix convention is supported by mysql and
+        # postgresql, e.g.:
+        #
+        # posix/Europe/Paris
+        # posix/America/Nipigon
+        #
+        # so it looks like a more reliably portable way of specifying it.
+        time_zones = {
+          'mssql'       => {
+                            'utc'       => 'UTC',
+                            'sao_paulo' => 'Argentina Standard Time',
+                            'tahiti'    => 'Hawaiian Standard Time',
+                            'paris'     => 'Central European Standard Time'
+                           },
+          'mysql'       => {
+                            'utc'       => 'UTC',
+                            'sao_paulo' => 'America/Sao_Paulo',
+                            'tahiti'    => 'Pacific/Tahiti',
+                            'paris'     => 'Europe/Paris'
+                           },
+          'oracle'  => {
+                            'utc'       => 'UTC',
+                            'sao_paulo' => 'America/Sao_Paulo',
+                            'tahiti'    => 'Pacific/Tahiti',
+                            'paris'     => 'Europe/Paris'
+                            },
+          'postgresql'  => {
+                            'utc'       => 'UTC',
+                            'sao_paulo' => 'America/Sao Paulo (-03)',
+                            'tahiti'    => 'Pacific/Tahiti (-10)',
+                            'paris'     => 'Europe/Paris'
+                            },
+        }
+
+        tz = time_zones[ENV['DB']]
+        skip "Unsupported timezone conversion for DB=#{ENV['DB']}" if tz.nil?
+        assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', tz['utc']))
+        assert_equal '2014/03/03 09:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', tz['sao_paulo']))
+        assert_equal '2014/03/03 02:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', tz['tahiti']))
+
+        # Winter/Summer time
+        assert_equal '2022/02/01 11:42:00', t(@lucas, Arel::Nodes.build_quoted('2022-02-01 10:42:00').cast(:datetime).format('%Y/%m/%d %H:%M:%S', tz['paris']))
+        assert_equal '2022/08/01 12:42:00', t(@lucas, Arel::Nodes.build_quoted('2022-08-01 10:42:00').cast(:datetime).format('%Y/%m/%d %H:%M:%S', tz['paris']))
       end
 
       def test_coalesce
@@ -500,7 +571,8 @@ module ArelExtensions
           assert_equal Time, t(@lucas,@updated_at.cast(:string).cast(:datetime)).class
           assert_equal Time, t(@lucas,@updated_at.cast(:time)).class
 
-          assert_equal "2014-03-03 12:42:00", t(@lucas,@updated_at.cast(:string)) unless @env_db == 'mssql' # locale dependent
+          # mysql adapter in rails7 adds some infos we just squeeze here
+          assert_equal "2014-03-03 12:42:00", t(@lucas,@updated_at.cast(:string)).split('.').first unless @env_db == 'mssql' # locale dependent
           assert_equal Date.parse("2014-03-03"), t(@lucas,Arel::Nodes.build_quoted('2014-03-03').cast(:date))
           assert_equal Date.parse("5014-03-03"), t(@lucas,(@age.cast(:string) + '014-03-03').cast(:date))
           assert_equal Time.parse("2014-03-03 12:42:00 UTC"), t(@lucas,@updated_at.cast(:string).cast(:datetime))
@@ -515,7 +587,7 @@ module ArelExtensions
         # puts @age.is_null.inspect
         # puts @age.is_null.to_sql
         # puts @age=='34'
-        assert_equal "Test", User.select(@name).where(@age.is_null.to_sql).first.name
+        assert_equal "Test", User.select(@name).where(@age.is_null).first.name
       end
 
       def test_math_plus
@@ -663,6 +735,7 @@ module ArelExtensions
       end
 
       def test_subquery_with_order
+        skip if ['mssql'].include?(@env_db) && Arel::VERSION.to_i < 10
         assert_equal 9, User.where(:name => User.select(:name).order(:name)).count
         assert_equal 9, User.where(@ut[:name].in(@ut.project(@ut[:name]).order(@ut[:name]))).count
         if !['mysql'].include?(@env_db)  # MySql can't have limit in IN subquery

data/test/with_ar/insert_agnostic_test.rb

@@ -2,7 +2,7 @@ require 'arelx_test_helper'
 require 'date'
 
 module ArelExtensions
-  module WthAr
+  module WithAr
     class InsertManagerTest < Minitest::Test
       def setup_db
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
@@ -13,7 +13,11 @@ module ArelExtensions
           @env_db = ENV['DB']
         end
         ActiveRecord::Base.establish_connection(@env_db.try(:to_sym) || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        ActiveRecord::Base.default_timezone = :utc
+        if ActiveRecord::VERSION::MAJOR >= 7
+          ActiveRecord.default_timezone = :utc
+        else
+          ActiveRecord::Base.default_timezone = :utc
+        end
         @cnx = ActiveRecord::Base.connection
         Arel::Table.engine = ActiveRecord::Base
         if File.exist?("init/#{@env_db}.sql")

data/test/with_ar/test_bulk_sqlite.rb

@@ -1,12 +1,16 @@
 require 'arelx_test_helper'
 
 module ArelExtensions
-  module WthAr
+  module WithAr
     describe 'the sqlite visitor' do
       before do
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        ActiveRecord::Base.default_timezone = :utc
+        if ActiveRecord::VERSION::MAJOR >= 7
+          ActiveRecord.default_timezone = :utc
+        else
+          ActiveRecord::Base.default_timezone = :utc
+        end
         @cnx = ActiveRecord::Base.connection
         Arel::Table.engine = ActiveRecord::Base
         @cnx.drop_table(:users) rescue nil

data/test/with_ar/test_math_sqlite.rb

@@ -1,12 +1,16 @@
 require 'arelx_test_helper'
 
 module ArelExtensions
-  module WthAr
+  module WithAr
     describe 'the sqlite visitor can do maths' do
       before do
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        ActiveRecord::Base.default_timezone = :utc
+        if ActiveRecord::VERSION::MAJOR >= 7
+          ActiveRecord.default_timezone = :utc
+        else
+          ActiveRecord::Base.default_timezone = :utc
+        end
         Arel::Table.engine = ActiveRecord::Base
         @cnx = ActiveRecord::Base.connection
         @cnx.drop_table(:users) rescue nil

data/test/with_ar/test_string_mysql.rb

@@ -2,12 +2,16 @@ require 'arelx_test_helper'
 require 'date'
 
 module ArelExtensions
-  module WthAr
+  module WithAr
     describe 'the mysql visitor can do string operations' do
       before do
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-mysql" : :mysql))
-        ActiveRecord::Base.default_timezone = :utc
+        if ActiveRecord::VERSION::MAJOR >= 7
+          ActiveRecord.default_timezone = :utc
+        else
+          ActiveRecord::Base.default_timezone = :utc
+        end
         begin
           @cnx = ActiveRecord::Base.connection
         rescue => e

data/test/with_ar/test_string_sqlite.rb

@@ -2,12 +2,16 @@ require 'arelx_test_helper'
 require 'date'
 
 module ArelExtensions
-  module WthAr
+  module WithAr
     describe 'the sqlite visitor can do string operations' do
       before do
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        ActiveRecord::Base.default_timezone = :utc
+        if ActiveRecord::VERSION::MAJOR >= 7
+          ActiveRecord.default_timezone = :utc
+        else
+          ActiveRecord::Base.default_timezone = :utc
+        end
         @cnx = ActiveRecord::Base.connection
         Arel::Table.engine = ActiveRecord::Base
         @cnx.drop_table(:users) rescue nil

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.25".freeze
+  VERSION = "1.3.1".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.22".freeze
+  VERSION = "2.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.1.1
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,16 +44,16 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 6.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +97,6 @@ files:
 - Rakefile
 - SQL_Challenges.md
 - TODO
-- appveyor.yml
 - arel_extensions.gemspec
 - functions.html
 - gemfiles/rails3.gemfile
@@ -107,6 +106,7 @@ files:
 - gemfiles/rails5_2.gemfile
 - gemfiles/rails6.gemfile
 - gemfiles/rails6_1.gemfile
+- gemfiles/rails7.gemfile
 - gemspecs/arel_extensions-v1.gemspec
 - gemspecs/arel_extensions-v2.gemspec
 - generate_gems.sh
@@ -116,11 +116,13 @@ files:
 - init/postgresql.sql
 - init/sqlite.sql
 - lib/arel_extensions.rb
+- lib/arel_extensions/aliases.rb
 - lib/arel_extensions/attributes.rb
 - lib/arel_extensions/boolean_functions.rb
 - lib/arel_extensions/common_sql_functions.rb
 - lib/arel_extensions/comparators.rb
 - lib/arel_extensions/date_duration.rb
+- lib/arel_extensions/helpers.rb
 - lib/arel_extensions/insert_manager.rb
 - lib/arel_extensions/math.rb
 - lib/arel_extensions/math_functions.rb
@@ -222,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Extending Arel