updateable_views_inheritance 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f91d01980fe8925967bf0ad4372fd1e8fe7dd5ce279221976dde06ab62ae405
-  data.tar.gz: ff35d58879a312f046b560a4121bf2c8efe0e3d65cff769ccd90559031a872fd
+  metadata.gz: 8cc7de06768bfaa7271e412ae2a2958b2eab9d67a82ea00f63937fee7819227e
+  data.tar.gz: 610d697e27f5c3a930ae3b73f9ca39d96e0306c1045d8bd7464d241612505662
 SHA512:
-  metadata.gz: 5340d92a39cb5a46c12d6bae63acc02b7f1139f7f52e9b2640ec05efd04bcfb1519559567de6e1ca1f7137526276827d93a0f7d611905376202b989f3c01b703
-  data.tar.gz: 29283b534f2fe02e503cecf6569abb3425e99cfce2a2f7180d7fc4147320a6824d60c0392bc5b4b6e436c7e9d3fd90514fd113f9d2f2cb54d5e4f9c41bda9480
+  metadata.gz: 487871f182d767012231ca8bc56167bd6365f6bed2641c3ff1d9bd9dbb6ac2e2bca0104775403c614f75091e3b25501ed4671eaad4a343c90439cc5b73e87ffe
+  data.tar.gz: bf8a7d7d021ba1316351ec069ba36fa0fbe42a89262b58332f629082b703b249969c52237411b446e8c0b48b5fecef4ca0892a6c84a4c583c24e785bd317d1c9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.7.0 (11 March 2025)
+
+Upgrade to Rails 7 (tested with 7.0, 7.1, 7.2 and ruby 2.7.3, 3.1.6)
+
+## 1.5.1 (27 February 2025)
+
+Upgrade to Rails 5.1
+
 ## 1.5.0 (31 January 2025)
 
 Upgrade to Rails 5

data/Gemfile

@@ -3,9 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in updateable_views_inheritance.gemspec
 gemspec
 
-if RUBY_VERSION > "2"
-  gem 'byebug'
-else
-  gem 'debugger'
-end
+gem 'byebug'
 

data/lib/updateable_views_inheritance/postgresql_adapter.rb

@@ -90,19 +90,29 @@ module ActiveRecord #:nodoc:
           if parent
             reset_pk_sequence!(parent, pk, sequence)
           else
-            unless pk and sequence
+            unless pk && sequence
               default_pk, default_sequence = pk_and_sequence_for(table)
+
               pk ||= default_pk
               sequence ||= default_sequence
             end
-            if pk
-              if sequence
-                select_value <<-SQL, 'Reset sequence'
-                  SELECT setval('#{sequence}', (SELECT COALESCE(MAX(#{pk})+(SELECT increment_by FROM #{sequence}), (SELECT min_value FROM #{sequence})) FROM #{table}), false)
-                SQL
-              else
-                @logger.warn "#{table} has primary key #{pk} with no default sequence" if @logger
+
+            if @logger && pk && !sequence
+              @logger.warn "#{table} has primary key #{pk} with no default sequence."
+            end
+
+            if pk && sequence
+              quoted_sequence = quote_table_name(sequence)
+              max_pk = query_value("SELECT MAX(#{quote_column_name pk}) FROM #{quote_table_name(table)}", "SCHEMA")
+              if max_pk.nil?
+                if postgresql_version >= 100000
+                  minvalue = query_value("SELECT seqmin FROM pg_sequence WHERE seqrelid = #{quote(quoted_sequence)}::regclass", "SCHEMA")
+                else
+                  minvalue = query_value("SELECT min_value FROM #{quoted_sequence}", "SCHEMA")
+                end
               end
+
+              query_value("SELECT setval(#{quote(quoted_sequence)}, #{max_pk ? max_pk : minvalue}, #{max_pk ? true : false})", "SCHEMA")
             end
           end
         end
@@ -342,33 +352,37 @@ module ActiveRecord #:nodoc:
           SQL
 
           # update
-          execute(<<~SQL)
+          update_rule = <<~SQL
             CREATE OR REPLACE RULE #{quote_column_name("#{child_view}_update")} AS
             ON UPDATE TO #{quote_table_name(child_view)} DO INSTEAD (
-              #{ if parent_columns.empty?
-                   ''
-                 else
-                   "UPDATE #{parent_table}
-                       SET #{ parent_columns.map { |col| "#{quote_column_name(col)} = NEW.#{quote_column_name(col)}" }.join(', ')}
-                       WHERE #{parent_pk} = OLD.#{parent_pk};"
-                 end }
-              #{ if child_columns.empty?
-                   ''
-                 else
-                   "UPDATE #{child_table}
-                       SET #{ child_columns.map { |col| "#{quote_column_name(col)} = NEW.#{quote_column_name(col)}" }.join(', ')}
-                       WHERE #{child_pk} = OLD.#{parent_pk}"
-                 end }
-            )
           SQL
+          unless parent_columns.empty?
+            update_rule += <<~SQL
+              UPDATE #{parent_table}
+              SET #{parent_columns.map { |col| "#{quote_column_name(col)} = NEW.#{quote_column_name(col)}" }.join(', ')}
+              WHERE #{parent_pk} = OLD.#{parent_pk};
+            SQL
+          end
+          unless child_columns.empty?
+            update_rule += <<~SQL
+              UPDATE #{child_table}
+              SET #{ child_columns.map { |col| "#{quote_column_name(col)} = NEW.#{quote_column_name(col)}" }.join(', ')}
+              WHERE #{child_pk} = OLD.#{parent_pk}
+            SQL
+          end
+          update_rule += ")"
+          execute(update_rule)
         end
 
         def insert_returning_clause(parent_pk, child_pk, child_view)
-          columns_cast_to_null = columns(child_view)
-                                 .reject { |c| c.name == parent_pk }
-                                 .map { |c| "CAST (NULL AS #{c.sql_type})" }
-                                 .join(", ")
-          "RETURNING #{child_pk}, #{columns_cast_to_null}"
+          columns_cast = columns(child_view).map do |c|
+            if c.name == parent_pk
+              "#{child_pk}::#{c.sql_type}"
+            else
+              "NULL::#{c.sql_type}"
+            end
+          end.join(", ")
+          "RETURNING #{columns_cast}"
         end
 
         def create_system_table_records(parent_relation, child_aggregate_view, child_relation)

data/lib/updateable_views_inheritance/version.rb

@@ -1,3 +1,3 @@
 module UpdateableViewsInheritance
-  VERSION = "1.5.0"
+  VERSION = "1.7.0"
 end

data/test/content_test.rb

@@ -2,11 +2,10 @@ require_relative 'test_helper'
 
 class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
   def setup
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 5)
+    ActiveRecord::MigrationContext.new("#{__dir__}/fixtures/migrations").migrate(5)
     ActiveRecord::FixtureSet.reset_cache
   end
 
-
   def test_find
     ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
     locomotive =  Locomotive.find(1)
@@ -33,10 +32,7 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
     ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :electric_locomotives)
     ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
 
-    binds = [[ElectricLocomotive.columns.find { |c| c.name == 'electricity_consumption'}, 40],
-             [ElectricLocomotive.columns.find { |c| c.name == 'max_speed'},              120],
-             [ElectricLocomotive.columns.find { |c| c.name == 'name'},                'BoBo'],
-             [ElectricLocomotive.columns.find { |c| c.name == 'type'},  'ElectricLocomotive']]
+    binds = [40, 120, 'BoBo', 'ElectricLocomotive']
     res = ActiveRecord::Base.connection.exec_query(<<-SQL, 'Test prepared statement', binds)
       INSERT INTO electric_locomotives (electricity_consumption, max_speed, name, type) VALUES ($1, $2, $3, $4) RETURNING id
     SQL
@@ -63,7 +59,7 @@ class UpdateableViewsInheritanceContentTest < ActiveSupport::TestCase
   def test_update
     ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
     steam_locomotive = Locomotive.find(1)
-    steam_locomotive.update_attributes( :name => 'Rocket')
+    steam_locomotive.update(name: 'Rocket')
     steam_locomotive.reload
     assert_equal 'Rocket', steam_locomotive.name
   end

data/test/deep_hierarchy_test.rb

@@ -2,12 +2,12 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 class DeepHierarchyTest < ActiveSupport::TestCase
   def setup
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 8)
+    ActiveRecord::MigrationContext.new("#{__dir__}/fixtures/migrations").migrate(8)
 
     ActiveRecord::FixtureSet.reset_cache
     # order of fixtures is important for the test - last loaded should not be with max(id)
-    %w(boats electric_trains rack_trains steam_trains cars maglev_trains bicycles).each do |f|
-      ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', f)
+    %w(boats electric_trains rack_trains steam_trains maglev_trains bicycles).each do |f|
+      ActiveRecord::FixtureSet.create_fixtures("#{__dir__}/fixtures/", f)
     end
     @connection = ActiveRecord::Base.connection
   end
@@ -41,17 +41,17 @@ class DeepHierarchyTest < ActiveSupport::TestCase
 
   def test_single_table_inheritance_deeper_hierarchy_contents
     mag = MaglevTrain.first
-    assert_equal [mag.id, mag.name, mag.number_of_rails, mag.max_speed, mag.magnetic_field, (sprintf("%.2f",mag.electricity_consumption))], (@connection.query("SELECT id, name, number_of_rails, max_speed, magnetic_field, electricity_consumption FROM all_vehicles WHERE id=#{mag.id}").first)
+    assert_equal [mag.id, mag.name, mag.number_of_rails, mag.max_speed, mag.magnetic_field, mag.electricity_consumption], (@connection.query("SELECT id, name, number_of_rails, max_speed, magnetic_field, electricity_consumption FROM all_vehicles WHERE id=#{mag.id}").first)
   end
 
   class OrderColumnsInAggregateView < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       rebuild_single_table_inheritance_view(:all_vehicles,:vehicles, %w(max_speed number_of_wheels id))
     end
   end
 
   def test_single_table_inheritance_view_order_view_columns
-    OrderColumnsInAggregateView.up
+    OrderColumnsInAggregateView.new.up
     assert_equal %w(max_speed number_of_wheels id),
                  (@connection.query("SELECT attname
                                        FROM pg_class, pg_attribute

data/test/dummy/config/application.rb

@@ -42,12 +42,6 @@ module Dummy
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
   end
 end
 

data/test/fixtures/migrations/1_add_updateable_views_inheritance.rb

@@ -1,5 +1,5 @@
 class AddUpdateableViewsInheritance < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     create_table(:updateable_views_inheritance, :id => false) do |t|
       t.column :parent_relation, :string
       t.column :child_aggregate_view, :string

data/test/fixtures/migrations/2_create_with_default_table.rb

@@ -1,5 +1,5 @@
 class CreateWithDefaultTable < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     create_table :locomotives do |t|
       t.column :name, :string
       t.column :max_speed, :integer

data/test/fixtures/migrations/3_create_with_explicit_table.rb

@@ -1,5 +1,5 @@
 class CreateWithExplicitTable < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     create_child(:electric_locomotives, :table => :raw_electric_locomotives, :parent => :locomotives)  do |t|
       t.decimal :electricity_consumption, :precision => 6, :scale => 2
     end

data/test/fixtures/migrations/4_create_deeper_hierarchy.rb

@@ -1,5 +1,5 @@
 class CreateDeeperHierarchy < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     create_child(:maglev_locomotives, :parent => :electric_locomotives)  do |t|
       t.column :magnetic_field, :integer
     end

data/test/fixtures/migrations/5_default_column_values.rb

@@ -1,5 +1,5 @@
 class DefaultColumnValues < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     create_child(:rack_locomotives, :parent => :locomotives) do |t|
       t.column :bidirectional, :boolean, :default => false
       t.column :narrow_gauge, :boolean, :default => true

data/test/fixtures/migrations/6_single_table_inheritance_view.rb

@@ -1,5 +1,5 @@
 class SingleTableInheritanceView < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     rebuild_parent_and_children_views(:locomotives)
     create_single_table_inheritance_view(:all_locomotives,:locomotives)
   end

data/test/fixtures/migrations/7_second_deep_hierarchy.rb

@@ -13,7 +13,7 @@ class SecondDeepHierarchy < ActiveRecord::Migration[4.2]
   #             steam_trains    rack_trains     electric_trains
   #                                                   |
   #                                               maglev_trains
-  def self.up
+  def up
     create_table :vehicles do |t|
       t.column :name, :string
       t.column :vehicle_type, :string

data/test/fixtures/migrations/8_second_single_table_inheritance_view.rb

@@ -1,5 +1,5 @@
 class SecondSingleTableInheritanceView < ActiveRecord::Migration[4.2]
-  def self.up
+  def up
     rebuild_parent_and_children_views(:vehicles)
     create_single_table_inheritance_view(:all_vehicles,:vehicles)
   end

data/test/instantiation_test.rb

@@ -2,8 +2,7 @@ require_relative 'test_helper'
 
 class InstantiationTest < ActiveSupport::TestCase
   def setup
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 7)
-
+    ActiveRecord::MigrationContext.new("#{__dir__}/fixtures/migrations").migrate(7)
     ActiveRecord::FixtureSet.reset_cache
     # order of fixtures is important for the test - last loaded should not be with max(id)
     %w[steam_locomotives electric_locomotives maglev_locomotives bicycles].each do |f|

data/test/migration_test.rb

@@ -7,20 +7,20 @@ class UpdateableViewsInheritanceMigrationTest < ActiveSupport::TestCase
   end
 
   def test_create_child_default
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 2)
+    ActiveRecord::MigrationContext.new("#{__dir__}/fixtures/migrations").migrate(2)
     assert_equal %w(coal_consumption id max_speed name type water_consumption),
                  @connection.columns(:steam_locomotives).map{ |c| c.name }.sort
   end
 
   def test_create_child_explicit_table
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 3)
+    ActiveRecord::MigrationContext.new("#{__dir__}/fixtures/migrations").migrate(3)
     assert_equal %w(electricity_consumption id max_speed name type),
                  @connection.columns(:electric_locomotives).map{ |c| c.name }.sort
   end
 
   def test_drop_child
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 3)
-    ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 2)
+    ActiveRecord::MigrationContext.new("#{__dir__}/fixtures/migrations").migrate(3)
+    ActiveRecord::MigrationContext.new("#{__dir__}/fixtures/migrations").migrate(2)
     assert_equal %w(steam_locomotives), @connection.views.sort
     assert_equal %w(ar_internal_metadata
                     locomotives

data/test/schema_test.rb

@@ -2,7 +2,7 @@ require_relative 'test_helper'
 
 class SchemaTest < ActiveSupport::TestCase
   def setup
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 5)
+    ActiveRecord::MigrationContext.new("#{__dir__}/fixtures/migrations").migrate(5)
     @connection = ActiveRecord::Base.connection
   end
 
@@ -13,7 +13,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   class CreateChildInSchemaWithPublicParent < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       execute "CREATE SCHEMA interrail"
       create_child('interrail.steam_locomotives', parent: 'locomotives') do |t|
         t.decimal :interrail_water_consumption, precision: 6, scale: 2
@@ -23,14 +23,14 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_pk_and_sequence_for_child_and_parent_in_different_schemas
-    CreateChildInSchemaWithPublicParent.up
+    CreateChildInSchemaWithPublicParent.new.up
     pk, seq = @connection.pk_and_sequence_for('interrail.steam_locomotives')
     assert_equal 'id', pk
     assert_equal 'public.locomotives_id_seq', seq.to_s
   end
 
   class CreateChildInSchemaWithParentInSchema < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       execute "CREATE SCHEMA interrail"
       create_table 'interrail.locomotives' do |t|
         t.column :interrail_name, :string
@@ -45,7 +45,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_pk_and_sequence_for_child_and_parent_in_same_nonpublic_schema
-    CreateChildInSchemaWithParentInSchema.up
+    CreateChildInSchemaWithParentInSchema.new.up
     pk, seq = @connection.pk_and_sequence_for('interrail.steam_locomotives')
     assert_equal 'id', pk
     assert_equal 'interrail.locomotives_id_seq', seq.to_s
@@ -65,7 +65,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   class ParentTableWithOnlyOneColumn < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       create_table(:parent_pk_only){}
       create_table :child_data do |t|
         t.column :name, :string
@@ -80,7 +80,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_parent_table_with_only_one_column
-    ParentTableWithOnlyOneColumn.up
+    ParentTableWithOnlyOneColumn.new.up
     assert @connection.views.include?('child')
     assert_equal %w(id name), @connection.columns(:child).map{|c| c.name}.sort
   ensure
@@ -88,7 +88,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   class ChildTableWithOnlyOneColumn < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       create_table :parent do |t|
         t.column :name, :string
       end
@@ -98,7 +98,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_child_table_with_only_one_column
-    ChildTableWithOnlyOneColumn.up
+    ChildTableWithOnlyOneColumn.new.up
     assert @connection.views.include?('child_pk_only'), "Could not create child view when child table has only one column"
     assert_equal %w(id name), @connection.columns(:child_pk_only).map{|c| c.name}.sort
   end
@@ -133,7 +133,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   class ChangeDefaultValueOfColumn < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       remove_parent_and_children_views(:rack_locomotives)
       change_column_default(:rack_locomotives_data, :rail_system, 'Marsh')
       rebuild_parent_and_children_views(:rack_locomotives)
@@ -141,24 +141,24 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_change_default_value_of_column
-    ChangeDefaultValueOfColumn.up
+    ChangeDefaultValueOfColumn.new.up
     RackLocomotive.reset_column_information
     assert_equal 'Marsh', RackLocomotive.new.rail_system
   end
 
   class RemoveChildrenViews < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       remove_parent_and_children_views(:locomotives)
     end
   end
 
   def test_remove_parent_and_children_views
-    RemoveChildrenViews.up
+    RemoveChildrenViews.new.up
     assert @connection.views.empty?
   end
 
   class RemoveColumnInParentTable < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       remove_parent_and_children_views(:locomotives)
       remove_column(:locomotives, :max_speed)
       rebuild_parent_and_children_views(:locomotives)
@@ -166,7 +166,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_remove_column_parent_table
-    RemoveColumnInParentTable.up
+    RemoveColumnInParentTable.new.up
     assert_equal %w(coal_consumption id name type water_consumption),
                  @connection.columns(:steam_locomotives).map{ |c| c.name }.sort
     assert_equal %w(electricity_consumption id magnetic_field name type),
@@ -174,7 +174,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   class RenameColumnInParentTable < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :electric_locomotives)
       ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :maglev_locomotives)
       ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :steam_locomotives)
@@ -186,7 +186,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_rename_column_parent_table
-    RenameColumnInParentTable.up
+    RenameColumnInParentTable.new.up
     assert_equal %w(coal_consumption id maximal_speed name type water_consumption),
                  @connection.columns(:steam_locomotives).map{ |c| c.name }.sort
     assert_equal %w(electricity_consumption id magnetic_field maximal_speed name type),
@@ -195,14 +195,14 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   class AddColumnToParentTable < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
       rebuild_parent_and_children_views(:electric_locomotives)
     end
   end
 
   def test_add_column_to_parent_table
-    AddColumnToParentTable.up
+    AddColumnToParentTable.new.up
     assert_equal %w(electricity_consumption id max_speed name number_of_engines type),
                  @connection.columns(:electric_locomotives).map{ |c| c.name }.sort
     assert_equal %w(electricity_consumption id magnetic_field max_speed name number_of_engines type),
@@ -211,7 +211,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   class ChangeChildRelationView < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       remove_parent_and_children_views(:electric_locomotives)
       rename_column(:raw_electric_locomotives, :electricity_consumption, :electric_consumption)
       rebuild_parent_and_children_views(:electric_locomotives)
@@ -219,13 +219,13 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_change_child_relation_view
-    ChangeChildRelationView.up
+    ChangeChildRelationView.new.up
     assert_equal %w(electric_consumption id max_speed name type),
                  @connection.columns(:electric_locomotives).map{ |c| c.name }.sort
   end
 
   class ChangeColumnInChildTable < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       drop_view(:steam_locomotives)
       rename_column(:steam_locomotives_data, :coal_consumption, :fuel_consumption)
       create_child_view(:locomotives, :steam_locomotives)
@@ -233,13 +233,13 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_change_column_in_child_table
-    ChangeColumnInChildTable.up
+    ChangeColumnInChildTable.new.up
     assert_equal %w(fuel_consumption id max_speed name type water_consumption),
                  @connection.columns(:steam_locomotives).map(&:name).sort
   end
 
   class CreateChildInSchema < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       execute "CREATE SCHEMA interrail"
       create_table 'interrail.locomotives' do |t|
         t.column :interrail_name, :string
@@ -254,7 +254,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_create_child_in_schema
-    CreateChildInSchema.up
+    CreateChildInSchema.new.up
     assert_equal %w[id
                     interrail_coal_consumption
                     interrail_max_speed
@@ -265,7 +265,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   class ChangeTablesInTwoInheritanceChains < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       add_column(:maglev_locomotives_data, :levitation_height, :integer)
       add_column(:bicycles_data, :wheel_size, :integer)
       rebuild_all_parent_and_children_views
@@ -273,9 +273,9 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_rebuild_all_parent_and_children_views
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 7)
+    ActiveRecord::MigrationContext.new("#{__dir__}/fixtures/migrations").migrate(7)
     @connection.execute "DROP VIEW all_locomotives" #FIXME: single table inheritance view should be rebuilt as well
-    ChangeTablesInTwoInheritanceChains.up
+    ChangeTablesInTwoInheritanceChains.new.up
 
     assert @connection.columns(:maglev_locomotives).map{ |c| c.name }.include?('levitation_height'),
            "Newly added column not present in view after rebuild for 1. hierarchy"
@@ -284,7 +284,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   class UseExistingTable < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       create_table :tbl_diesel_locomotives do |t|
         t.belongs_to :locomotives
         t.integer :num_cylinders
@@ -297,12 +297,12 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_skip_creating_child_table
-    UseExistingTable.up
+    UseExistingTable.new.up
     assert @connection.columns(:diesel_locomotives).map(&:name).include?("num_cylinders")
   end
 
   class ReservedSQLWords < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       create_child(:table, parent: :locomotives) do |t|
         t.integer :column
       end
@@ -313,14 +313,14 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_reserved_words_in_tables_and_columns
-    ReservedSQLWords.up
+    ReservedSQLWords.new.up
     assert @connection.columns(:table).map(&:name).include?("column")
   ensure
     ReservedSQLWords.down
   end
 
   class ChildTableIsActuallyView < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       execute <<-SQL.squish
         CREATE VIEW punk_locomotives_data AS (
           SELECT steam_locomotives.id,
@@ -342,7 +342,7 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_child_table_is_view
-    ChildTableIsActuallyView.up
+    ChildTableIsActuallyView.new.up
     assert_equal @connection.columns(:punk_locomotives).map(&:name).sort,
                  %w(coal electro id max_speed name type)
   end

data/test/single_table_inheritance_test.rb

@@ -2,7 +2,7 @@ require_relative 'test_helper'
 
 class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
   def setup
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 6)
+    ActiveRecord::MigrationContext.new("#{__dir__}/fixtures/migrations").migrate(6)
     # order of fixtures is important for the test - last loaded should not be with max(id)
     %w(electric_locomotives maglev_locomotives steam_locomotives).each do |f|
       ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', f)
@@ -31,7 +31,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
   end
 
   class AddColumnToParentTable < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
       drop_view(:all_locomotives)
       rebuild_parent_and_children_views(:electric_locomotives)
@@ -40,13 +40,13 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
   end
 
   def test_single_table_inheritance_view_add_column_to_parent_table
-    AddColumnToParentTable.up
+    AddColumnToParentTable.new.up
     assert_equal %w(coal_consumption id max_speed name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system number_of_engines).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
 
   class RemoveColumnInParentTable < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       drop_view(:all_locomotives)
       remove_parent_and_children_views(:locomotives)
       remove_column(:locomotives, :max_speed)
@@ -56,13 +56,13 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
   end
 
   def test_single_table_inheritance_view_remove_column_parent_table
-    RemoveColumnInParentTable.up
+    RemoveColumnInParentTable.new.up
     assert_equal %w(coal_consumption id name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
 
   class RenameColumnInParentTable < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       drop_view(:all_locomotives)
       remove_parent_and_children_views(:locomotives)
       rename_column(:locomotives, :max_speed, :maximal_speed)
@@ -72,13 +72,13 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
   end
 
   def test_single_table_inheritance_view_rename_column_parent_table
-    RenameColumnInParentTable.up
+    RenameColumnInParentTable.new.up
     assert_equal %w(coal_consumption id maximal_speed name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
 
   class ChangeChildRelationView < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       drop_view(:all_locomotives)
       remove_parent_and_children_views(:electric_locomotives)
       rename_column(:raw_electric_locomotives, :electricity_consumption, :electric_consumption)
@@ -88,13 +88,13 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
   end
 
   def test_single_table_inheritance_view_change_child_relation_view
-    ChangeChildRelationView.up
+    ChangeChildRelationView.new.up
     assert_equal %w(coal_consumption id max_speed name type water_consumption electric_consumption bidirectional narrow_gauge magnetic_field rail_system).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
 
   class ConflictColumns < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       drop_view(:all_locomotives)
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
       add_column(:steam_locomotives_data, :number_of_engines, :string)
@@ -105,14 +105,14 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
   end
 
   def test_single_table_inheritance_view_conflict_columns
-    ConflictColumns.up
+    ConflictColumns.new.up
     assert_equal %w(coal_consumption id max_speed name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system number_of_engines).sort,
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
     assert_equal 'text', @connection.columns(:all_locomotives).detect{|c| c.name == "number_of_engines"}.sql_type
   end
 
   class ConflictColumnsWithValues < ActiveRecord::Migration[4.2]
-    def self.up
+    def up
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
       add_column(:steam_locomotives_data, :number_of_engines, :string)
       execute("UPDATE raw_electric_locomotives SET number_of_engines = 2")
@@ -126,7 +126,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
 
   # FIXME: flaky test_single_table_inheritance_view_conflict_columns_with_values
   # def test_single_table_inheritance_view_conflict_columns_with_values
-  #   ConflictColumnsWithValues.up
+  #   ConflictColumnsWithValues.new.up
   #   ::SteamLocomotive.reset_column_information
   #   ::ElectricLocomotive.reset_column_information
   #   assert_equal %w(coal_consumption id max_speed name type water_consumption electricity_consumption bidirectional narrow_gauge magnetic_field rail_system number_of_engines).sort,

data/test/test_helper.rb

@@ -33,9 +33,7 @@ require 'byebug'
 
 class ActiveSupport::TestCase #:nodoc:
   include ActiveRecord::TestFixtures
-  self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
   ActiveRecord::Migration.verbose = false
-  # self.use_transactional_fixtures = true
 
   # def teardown
   #   ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 1)

data/updateable_views_inheritance.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency "activerecord", "~> 5.0.7"
+  s.add_dependency "activerecord", '>= 7', '< 8'
   s.add_dependency "pg"
 
-  s.add_development_dependency 'bigdecimal', '1.3.5'
   s.add_development_dependency "bundler"
+  s.add_development_dependency "concurrent-ruby", '1.3.4'
   s.add_development_dependency "minitest"
   s.add_development_dependency "minitest-reporters"
-  s.add_development_dependency "rails", '~> 5.0.7'
+  s.add_development_dependency "rails", '>= 7', '< 8'
   s.add_development_dependency "rake"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "simplecov_json_formatter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: updateable_views_inheritance
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Sava Chankov
@@ -9,22 +9,28 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-31 00:00:00.000000000 Z
+date: 2025-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -40,33 +46,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bigdecimal
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -99,16 +105,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement