Changes for Rails 7 compatibility

Author: dshoemaker

Appraisals

@@ -1,21 +1,5 @@
 #-*- ruby -*-
-
-appraise 'rails50' do
-  gem 'rails', '~> 5.0.0'
-  gem 'jquery-rails'
-end
-
-appraise 'rails51' do
-  gem 'rails', '~> 5.1.0'
-  gem 'jquery-rails'
-end
-
-appraise 'rails52' do
-  gem 'rails', '~> 5.2.0'
-  gem 'jquery-rails'
-end
-
-appraise 'rails60' do
-  gem 'rails', '~> 6'
+appraise 'rails70' do
+  gem 'rails', '~> 7.0'
   gem 'jquery-rails'
 end

activerecord-tablefree.gemspec

@@ -25,13 +25,13 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency('activerecord', '>= 6.0.0')
 
-  gem.add_development_dependency('bundler', '~> 1')
-  gem.add_development_dependency('rake', '~> 12', '> 0')
+  gem.add_development_dependency('bundler', '~> 2')
+  gem.add_development_dependency('rake', '~> 13', '> 0')
 
   #  gem.add_development_dependency("rails") # This is in the appraisal gemfiles
   gem.add_development_dependency('sqlite3', '~> 1')
 
-  gem.add_development_dependency('appraisal', '~> 1')
+  gem.add_development_dependency('appraisal', '~> 2')
   gem.add_development_dependency('aruba', '~> 0')
   gem.add_development_dependency('cucumber', '~> 3')
   gem.add_development_dependency('rspec', '~> 3')
@@ -42,7 +42,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('gem-release', '~> 2')
   gem.add_development_dependency('listen', '~> 3')
   gem.add_development_dependency('nokogiri', '~> 1.0')
-  gem.add_development_dependency('rails', '~> 6')
+  gem.add_development_dependency('rails', '~> 7.0')
   gem.add_development_dependency('wwtd', '~> 1')
 
   #  gem.add_development_dependency('launchy', '~> 2.1')

gemfiles/.DS_Store

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "byebug", platform: :mri
-gem "rails", "~> 6"
+gem "rails", "~> 7.0"
 gem "jquery-rails"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails50.gemfile

@@ -92,9 +92,24 @@ def column(name, sql_type = nil, default = nil, null = true, cast_class_params =
                      else
                        "ActiveRecord::Type::#{sql_type.to_s.camelize}".constantize rescue nil
                      end
-        raise InvalidColumnType, "sql_type is #{sql_type} (#{sql_type.class}), which is not supported" unless cast_class.respond_to?(:new)
+        unless cast_class.respond_to?(:new)
+          raise InvalidColumnType, "sql_type is #{sql_type} (#{sql_type.class}), which is not supported"
+        end
+
         cast_type = cast_class.new(*cast_class_params)
-        tablefree_options[:columns_hash][name.to_s] = ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, cast_type, null)
+        sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(
+          sql_type: cast_type.type.to_s,
+          type: cast_type.type,
+          limit: cast_type.limit,
+          precision: cast_type.precision,
+          scale: cast_type.scale
+        )
+        tablefree_options[:columns_hash][name.to_s] = ActiveRecord::ConnectionAdapters::Column.new(
+          name.to_s,
+          default,
+          sql_type_metadata,
+          null
+        )
       end
 
       # Register a set of columns with the same SQL type
@@ -123,7 +138,7 @@ def destroy_all(*_args)
       end
 
       case ActiveRecord::VERSION::MAJOR
-      when 5, 6
+      when 5, 6, 7
         def find_by_sql(*_args)
           case tablefree_options[:database]
           when :pretend_success

gemfiles/rails51.gemfile

@@ -55,8 +55,8 @@ def combine_bind_parameters(**_args)
       ''
     end
 
-    def lookup_cast_type_from_column(*_args)
-      @_cast_type ||= ActiveRecord::Tablefree::CastType.new
+    def lookup_cast_type_from_column(column)
+      @_cast_type = lookup_cast_type(column.type)
     end
 
     def current_transaction

gemfiles/rails52.gemfile

@@ -50,7 +50,7 @@ def remove_models
   it { should respond_to :id= }
   it { should respond_to :name }
   it { should respond_to :name= }
-  it { should respond_to :update_attributes }
+  it { should respond_to :update }
   describe '#attributes=' do
     before(:example) { subject.attributes = ({ name: 'Jarl Friis' }) }
     it 'assign attributes' do
@@ -99,25 +99,6 @@ def remove_models
 end
 
 shared_examples_for 'a tablefree model with fail_fast' do
-  case ActiveRecord::VERSION::MAJOR
-  when 3
-    describe '#all' do
-      it 'raises ActiveRecord::Tablefree::NoDatabase' do
-        expect { subject.all }.to raise_exception(ActiveRecord::Tablefree::NoDatabase)
-      end
-    end
-  when 4
-    describe '#all' do
-      it 'raises ActiveRecord::Tablefree::NoDatabase' do
-        expect { subject.all }.to_not raise_exception
-      end
-    end
-    describe '#all[]' do
-      it 'raises ActiveRecord::Tablefree::NoDatabase' do
-        expect { subject.all[0] }.to raise_exception(ActiveRecord::Tablefree::NoDatabase)
-      end
-    end
-  end
   describe '#create' do
     it 'raises ActiveRecord::Tablefree::NoDatabase' do
       expect { subject.create(name: 'Jarl') }.to raise_exception(ActiveRecord::Tablefree::NoDatabase)
@@ -152,9 +133,9 @@ def remove_models
       expect { subject.reload }.to raise_exception(ActiveRecord::Tablefree::NoDatabase)
     end
   end
-  describe '#update_attributes' do
+  describe '#update' do
     it 'raises ActiveRecord::Tablefree::NoDatabase' do
-      expect { subject.update_attributes(name: 'Jarl') }.to raise_exception(StandardError)
+      expect { subject.update(name: 'Jarl') }.to raise_exception(StandardError)
     end
   end
 end
@@ -193,10 +174,10 @@ def remove_models
     subject { Chair.new(name: 'Jarl') }
     it_behaves_like 'a tablefree model instance with fail_fast'
     it_behaves_like 'a nested active record'
-    describe '#update_attributes' do
+    describe '#update' do
       it 'raises ActiveRecord::Tablefree::NoDatabase' do
         expect do
-          subject.update_attributes(arm_rests: { name: 'nice arm_rest' })
+          subject.update(arm_rests: { name: 'nice arm_rest' })
         end.to raise_exception(StandardError)
       end
     end
@@ -256,8 +237,8 @@ def remove_models
     before { subject.save! }
     specify { expect(subject.reload).to eq subject }
   end
-  describe '#update_attributes' do
-    specify { expect(subject.update_attributes(name: 'Jarl Friis')).to eq true }
+  describe '#update' do
+    specify { expect(subject.update(name: 'Jarl Friis')).to eq true }
   end
 end
 
@@ -273,7 +254,7 @@ class Chair < ActiveRecord::Base
   end
   after(:context) do
     remove_models
-    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.connection_handler.clear_all_connections!
   end
 
   subject { Chair }