arel_extensions 2.0.21 → 2.1.0

data/lib/arel_extensions/nodes/json.rb

@@ -46,7 +46,9 @@ module ArelExtensions
         when DateTime, Time
           convert_to_node(n.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
         when NilClass
-          Arel.sql('null')
+          Arel.null
+        when Arel::SelectManager
+          Arel.grouping(n)
         else
           convert_to_node(n)
         end

data/lib/arel_extensions/nodes/length.rb

@@ -2,6 +2,12 @@ module ArelExtensions
   module Nodes
     class Length < Function
       RETURN_TYPE = :integer
+      attr_accessor :bytewise
+
+      def initialize(node, bytewise = true)
+        @bytewise = bytewise
+        super([node])
+      end
     end
   end
 end

data/lib/arel_extensions/nodes/replace.rb

@@ -10,10 +10,6 @@ module ArelExtensions
         @substitute = convert_to_node(substitute)
         super([@left,@pattern,@substitute])
       end
-
-      def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
-      end
     end
 
     class RegexpReplace < Function
@@ -26,10 +22,6 @@ module ArelExtensions
         @substitute = convert_to_node(substitute)
         super([@left,@pattern,@substitute])
       end
-
-      def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
-      end
     end
   end
 end

data/lib/arel_extensions/nodes/union.rb

@@ -14,7 +14,7 @@ module ArelExtensions
       end
 
       def as other
-        Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
+        Arel::Nodes::TableAlias.new Arel.grouping(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
   end

data/lib/arel_extensions/nodes/union_all.rb

@@ -10,7 +10,7 @@ module ArelExtensions
       end
 
       def as other
-        Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
+        Arel::Nodes::TableAlias.new Arel.grouping(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
   end

data/lib/arel_extensions/string_functions.rb

@@ -24,9 +24,17 @@ module ArelExtensions
       ArelExtensions::Nodes::FindInSet.new [other, self]
     end
 
-    # LENGTH function returns the length of the value in a text field.
+    # LENGTH function returns the length (bytewise) of the value in a text field.
     def length
-      ArelExtensions::Nodes::Length.new [self]
+      ArelExtensions::Nodes::Length.new self, true
+    end
+
+    def byte_length
+      ArelExtensions::Nodes::Length.new self, true
+    end
+
+    def char_length
+      ArelExtensions::Nodes::Length.new self, false
     end
 
     # LOCATE function returns the first starting position of a string in another string.

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.21".freeze
+  VERSION = "2.1.0".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -155,7 +155,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LEN("
+        collector << "#{o.bytewise ? 'DATALENGTH' : 'LEN'}("
         collector = visit o.expr, collector
         collector << ")"
         collector

data/lib/arel_extensions/visitors/mysql.rb

@@ -354,9 +354,16 @@ module ArelExtensions
         else
           collector = visit o.left, collector
         end
-        collector << " AS `"
+        collector << " AS "
+
+        # sometimes these values are already quoted, if they are, don't double quote it
+        quote = o.right.is_a?(Arel::Nodes::SqlLiteral) && o.right[0] != '`' && o.right[-1] != '`'
+
+        collector << '`' if quote
         collector = visit o.right, collector
-        collector << "`"
+        collector << '`' if quote
+
+        collector
         collector
       end
 

data/lib/arel_extensions/visitors/oracle.rb

@@ -308,7 +308,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LENGTH("
+        collector << "LENGTH#{o.bytewise ? 'B' : ''}("
         collector = visit o.expr, collector
         collector << ")"
         collector

data/lib/arel_extensions/visitors/postgresql.rb

@@ -86,9 +86,15 @@ module ArelExtensions
         else
           collector = visit o.left, collector
         end
-        collector << " AS \""
+        collector << " AS "
+
+        # sometimes these values are already quoted, if they are, don't double quote it
+        quote = o.right.is_a?(Arel::Nodes::SqlLiteral) && o.right[0] != '"' && o.right[-1] != '"'
+        
+        collector << '"' if quote
         collector = visit o.right, collector
-        collector << "\""
+        collector << '"' if quote
+        
         collector
       end
 
@@ -373,6 +379,8 @@ module ArelExtensions
           Arel::Nodes::SqlLiteral.new('date')
         when :binary
           Arel::Nodes::SqlLiteral.new('binary')
+        when :jsonb
+          Arel::Nodes::SqlLiteral.new('jsonb')
         else
           Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
         end
@@ -401,13 +409,13 @@ module ArelExtensions
             ArelExtensions::Nodes::Concat.new([
                 Arel::Nodes::NamedFunction.new('TRIM',[
                   Arel::Nodes::NamedFunction.new('TO_CHAR',[
-                    col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor),
+                    Arel.when(col.not_eq 0).then(col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor)).else(1),
                     Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
                   ])]),
                 o.type,
                 Arel::Nodes::NamedFunction.new('TRIM',[
                   Arel::Nodes::NamedFunction.new('TO_CHAR',[
-                    col.abs.log10.floor,
+                    Arel.when(col.not_eq 0).then(col.abs.log10.floor).else(0),
                     Arel::Nodes.build_quoted('FM'+nines_before)
                   ])])
               ])
@@ -511,8 +519,6 @@ module ArelExtensions
           collector << '::jsonb'
         when NilClass
           collector  << %Q['null'::jsonb]
-        when Arel::Attributes::Attribute
-          collector = visit o.dict.cast(:jsonb), collector
         else
           collector = visit o.dict, collector
           collector << '::jsonb'
@@ -532,7 +538,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_JsonGet o,collector
         collector = visit o.dict, collector
-        collector << ' -> '
+        collector << ' ->> '
         collector = visit o.key, collector
         collector
       end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -8,10 +8,15 @@ module ArelExtensions
       def make_json_string expr
         Arel::Nodes.build_quoted('"') \
         + expr
+            .coalesce('')
             .replace('\\','\\\\').replace('"','\"').replace("\n", '\n') \
         + '"'
       end
 
+      def make_json_null
+        Arel::Nodes.build_quoted("null")
+      end
+
       # Math Functions
       def visit_ArelExtensions_Nodes_Abs o, collector
         collector << "ABS("
@@ -117,7 +122,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LENGTH("
+        collector << "#{o.bytewise ? '' : 'CHAR_'}LENGTH("
         collector = visit o.left, collector
         collector << ")"
         collector
@@ -601,20 +606,20 @@ module ArelExtensions
       def json_value(o,v)
         case o.type_of_node(v)
         when :string
-          Arel.when(v.is_null).then(Arel::Nodes.build_quoted("null")).else(make_json_string(v))
+          Arel.when(v.is_null).then(make_json_null).else(make_json_string(v))
         when :date
           s = v.format('%Y-%m-%d')
-          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+          Arel.when(s.is_null).then(make_json_null).else(make_json_string(s))
         when :datetime
           s = v.format('%Y-%m-%dT%H:%M:%S')
-          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+          Arel.when(s.is_null).then(make_json_null).else(make_json_string(s))
         when :time
           s = v.format('%H:%M:%S')
-          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+          Arel.when(s.is_null).then(make_json_null).else(make_json_string(s))
         when :nil
-          Arel::Nodes.build_quoted("null")
+          make_json_null
         else
-          ArelExtensions::Nodes::Cast.new([v, :string]).coalesce("null")
+          ArelExtensions::Nodes::Cast.new([v, :string]).coalesce(make_json_null)
         end
       end
 
@@ -636,7 +641,7 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            res += make_json_string(ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("")) + ': '
+            res += make_json_string(ArelExtensions::Nodes::Cast.new([k, :string])) + ': '
             res += json_value(o,v)
           end
           res += '}'
@@ -658,7 +663,7 @@ module ArelExtensions
             if i != 0
               res = res + ', '
             end
-            kv = make_json_string(ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("")) + ': '
+            kv = make_json_string(ArelExtensions::Nodes::Cast.new([k, :string])) + ': '
             kv += json_value(o,v)
             res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
           end

data/lib/arel_extensions/visitors.rb

@@ -9,9 +9,17 @@ if defined?(Arel::Visitors::Oracle)
   require 'arel_extensions/visitors/oracle12'
 end
 
-if defined?(Arel::Visitors::MSSQL)
+if defined?(Arel::Visitors::SQLServer) || defined?(Arel::Visitors::MSSQL)
   require 'arel_extensions/visitors/mssql'
+end
 
+if defined?(Arel::Visitors::SQLServer)
+  class Arel::Visitors::SQLServer
+    include ArelExtensions::Visitors::MSSQL
+  end
+end
+
+if defined?(Arel::Visitors::MSSQL)
   class Arel::Visitors::MSSQL
     include ArelExtensions::Visitors::MSSQL
 

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'
@@ -88,11 +89,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 +103,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 +137,7 @@ class Arel::Attributes::Attribute
 end
 
 class Arel::Nodes::Function
+  include ArelExtensions::Aliases
   include ArelExtensions::Math
   include ArelExtensions::Comparators
   include ArelExtensions::DateDuration
@@ -158,6 +173,9 @@ class Arel::Nodes::Unary
   include ArelExtensions::MathFunctions
   include ArelExtensions::Comparators
   include ArelExtensions::Predications
+  def eql? other
+    hash == other.hash
+  end
 end
 
 class Arel::Nodes::Binary
@@ -167,6 +185,9 @@ class Arel::Nodes::Binary
   include ArelExtensions::Comparators
   include ArelExtensions::BooleanFunctions
   include ArelExtensions::Predications
+  def eql? other
+    hash == other.hash
+  end
 end
 
 class Arel::Nodes::Equality
@@ -183,6 +204,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
@@ -192,7 +226,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/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/visitors/test_to_sql.rb

@@ -282,16 +282,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 +380,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
@@ -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,7 +368,6 @@ 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%%'))
       end
@@ -500,7 +509,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))

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.24".freeze
+  VERSION = "1.3.0".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.21".freeze
+  VERSION = "2.1.0".freeze
 end