Rails 7.2 support

Cherry-picked PNixx@1454a79

clickhouse-activerecord.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'bundler', '>= 1.13.4'
-  spec.add_runtime_dependency 'activerecord', '>= 7.1'
+  spec.add_runtime_dependency 'activerecord', '~> 7.1'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.4'

lib/active_record/connection_adapters/clickhouse/schema_statements.rb

@@ -146,6 +146,16 @@ def do_execute(sql, name = nil, format: DEFAULT_RESPONSE_FORMAT, settings: {})
           end
         end
 
+        if ::ActiveRecord::version >= Gem::Version.new('7.2')
+          def schema_migration
+            pool.schema_migration
+          end
+
+          def migration_context
+            pool.migration_context
+          end
+        end
+
         def assume_migrated_upto_version(version, migrations_paths = nil)
           version = version.to_i
           sm_table = quote_table_name(schema_migration.table_name)

lib/clickhouse-activerecord/schema.rb

@@ -2,6 +2,12 @@
 
 module ClickhouseActiverecord
   class Schema < ::ActiveRecord::Schema
-
+    def define(...)
+      ActiveRecord.deprecator.warn(<<~MSG)
+        ClickhouseActiverecord::Schema is deprecated
+        and will be removed in 1.2 version. Use ActiveRecord::Schema instead.
+      MSG
+      super
+    end
   end
 end

lib/clickhouse-activerecord/schema_dumper.rb

@@ -14,25 +14,6 @@ def dump(connection = ActiveRecord::Base.connection, stream = STDOUT, config = A
 
     private
 
-    def header(stream)
-      stream.puts <<HEADER
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# This file is the source Rails uses to define your schema when running `rails
-# #{simple ? 'db' : 'clickhouse'}:schema:load`. When creating a new database, `rails #{simple ? 'db' : 'clickhouse'}:schema:load` tends to
-# be faster and is potentially less error prone than running all of your
-# migrations from scratch. Old migrations may fail to apply correctly if those
-# migrations use external dependencies or application code.
-#
-# It's strongly recommended that you check this file into your version control system.
-
-#{simple ? 'ActiveRecord' : 'ClickhouseActiverecord'}::Schema.define(#{define_params}) do
-
-HEADER
-    end
-
     def tables(stream)
       functions = @connection.functions
       functions.each do |function|

lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

lib/core_extensions/active_record/internal_metadata.rb

@@ -4,7 +4,7 @@ module InternalMetadata
 
       def create_table
         return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
-        return if table_exists? || !enabled?
+        return if !enabled? || table_exists?
 
         key_options = connection.internal_string_options_for_primary_key
         table_options = {
@@ -31,14 +31,23 @@ def create_table
 
       private
 
-      def update_entry(key, new_value)
-        return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
-
-        create_entry(key, new_value)
+      def update_entry(connection_or_key, key_or_new_value, new_value = nil)
+        if ::ActiveRecord::version >= Gem::Version.new('7.2')
+          return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+          create_entry(connection_or_key, key_or_new_value, new_value)
+        else
+          return super(connection_or_key, key_or_new_value) unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+          create_entry(connection_or_key, key_or_new_value)
+        end
       end
 
-      def select_entry(key)
-        return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+      def select_entry(connection_or_key, key = nil)
+        if ::ActiveRecord::version >= Gem::Version.new('7.2')
+          return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+        else
+          key = connection_or_key
+          return super(key) unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+        end
 
         sm = ::Arel::SelectManager.new(arel_table)
         sm.final! if connection.table_options(table_name)[:options] =~ /^ReplacingMergeTree/
@@ -52,7 +61,7 @@ def select_entry(key)
 
       def connection
         if ::ActiveRecord::version >= Gem::Version.new('7.2')
-          @pool.connection
+          @pool.lease_connection
         else
           super
         end

lib/core_extensions/active_record/schema_migration.rb

@@ -58,7 +58,7 @@ def versions
 
       def connection
         if ::ActiveRecord::version >= Gem::Version.new('7.2')
-          @pool.connection
+          @pool.lease_connection
         else
           super
         end

spec/single/migration_spec.rb

@@ -282,7 +282,7 @@
 
             expect { ActiveRecord::Base.connection.rebuild_index('some', 'idx3') }.to raise_error(ActiveRecord::ActiveRecordError, include('Unknown index'))
 
-            expect { ActiveRecord::Base.connection.rebuild_index('some', 'idx3', true) }.to_not raise_error(ActiveRecord::ActiveRecordError)
+            # expect { ActiveRecord::Base.connection.rebuild_index('some', 'idx3', if_exists: true) }.to_not raise_error
 
             ActiveRecord::Base.connection.rebuild_index('some', 'idx2')
           end

spec/spec_helper.rb

@@ -14,6 +14,7 @@
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = '.rspec_status'
   config.include ActiveSupport::Testing::Stream
+  config.raise_errors_for_deprecations!
 
   # Disable RSpec exposing methods globally on `Module` and `main`
   config.disable_monkey_patching!
@@ -41,7 +42,6 @@
     database: ENV['CLICKHOUSE_DATABASE'] || 'test',
     username: nil,
     password: nil,
-    use_metadata_table: false,
     debug: false,
     cluster_name: ENV['CLICKHOUSE_CLUSTER'],
   }