updateable_views_inheritance 1.4.7 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661b8ded59885a6e482cac9d0dfec5f9e1ab10050e3944b5f176e543958f8a33
-  data.tar.gz: fa8e6f63a74a28f9a09d1574ec6e3ae788df2ebdf3eead5789ef691c40337aed
+  metadata.gz: 2f91d01980fe8925967bf0ad4372fd1e8fe7dd5ce279221976dde06ab62ae405
+  data.tar.gz: ff35d58879a312f046b560a4121bf2c8efe0e3d65cff769ccd90559031a872fd
 SHA512:
-  metadata.gz: 1aec9cfeeb1aab4761e2efffc73219d7d9db7b605a8575fa470b5491783882415e51afdb8d7d48536242f0df4d2a448e8e3777c00ef9a65ec089001fb3e5a9e3
-  data.tar.gz: 46fb1b1a91344c01d55a48f47ef96e02f0d058a7f7781462c22cda18fa7d2a6eaa90f1e8cb94e7c1a03523c6d83d2aa500b43d4a83d011db0549bc65cfa4d9b6
+  metadata.gz: 5340d92a39cb5a46c12d6bae63acc02b7f1139f7f52e9b2640ec05efd04bcfb1519559567de6e1ca1f7137526276827d93a0f7d611905376202b989f3c01b703
+  data.tar.gz: 29283b534f2fe02e503cecf6569abb3425e99cfce2a2f7180d7fc4147320a6824d60c0392bc5b4b6e436c7e9d3fd90514fd113f9d2f2cb54d5e4f9c41bda9480

data/.github/workflows/build.yml

@@ -41,15 +41,14 @@ jobs:
       - name: Set up Ruby
       # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
       # change this to (see https://github.com/ruby/setup-ruby#versioning):
-      # uses: ruby/setup-ruby@v1
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-          bundler: 1.17.3 # temporary set until rails 5 upgrade
+          bundler: 2.4.22 # temporary set until rails 5 upgrade
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Run tests
-        run: bundle exec rake 2>/dev/null # disable warnings until ruby 3 upgrade
+        run: bundle exec rake
 
       # From https://stackoverflow.com/questions/74199483/sonarcloud-ci-cant-find-source-files-for-ruby-simplecov-coverage
       - name: Fix code coverage paths for DeepSource

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.5.0 (31 January 2025)
+
+Upgrade to Rails 5
+
+## 1.4.8 (17 December 2024)
+Bugfixes:
+  - Fix pk_and_sequence_for to be interoperable with other AR methods
+
 ## 1.4.7 (06 November 2024)
 
 Bugfixes:

data/lib/updateable_views_inheritance/active_record_extensions.rb

@@ -0,0 +1,22 @@
+
+module UpdateableViewsInheritance# :nodoc:
+  module ActiveRecordExtensions #:nodoc:
+    module ClassMethods #:nodoc:
+      attr_accessor :disable_inheritance_instantiation
+
+      def instantiate(attributes, column_types = {})
+        object = super(attributes, column_types = {})
+        if object.class.name == self.name || self.disable_inheritance_instantiation
+          object
+        else
+          object.class.find(attributes.with_indifferent_access[:id])
+        end
+      end
+    end
+  end
+end
+
+# Here we override AR class methods. If you need to override
+# instance methods, prepend() them to the class, not to the singleton class
+ActiveRecord::Base.singleton_class.send :prepend, UpdateableViewsInheritance::ActiveRecordExtensions::ClassMethods
+

data/lib/updateable_views_inheritance/postgresql_adapter.rb

@@ -126,13 +126,23 @@ module ActiveRecord #:nodoc:
                AND cons.contype  = 'p'
                AND attr.attnum   = ANY(cons.conkey)
           SQL
-          if result.blank? #result.empty?
+
+          if result.nil? or result.empty?
             parent = parent_table(relation)
             pk_and_sequence_for(parent) if parent
           else
-            # log(result[0], "PK for #{relation}") {}
-            [result[0], query("SELECT pg_get_serial_sequence('#{relation}', '#{result[0]}') ")[0][0]]
+            pk = result[0]
+            sequence = query("SELECT pg_get_serial_sequence('#{relation}', '#{result[0]}') ")[0][0]
+            if sequence
+              # ActiveRecord expects PostgreSQL::Name object as sequence, not a string
+              sequence_with_schema = Utils.extract_schema_qualified_name(sequence)
+              [pk, sequence_with_schema]
+            else
+              [pk, nil]
+            end
           end
+        rescue
+          nil
         end
 
         # Drops a view from the database.
@@ -140,16 +150,6 @@ module ActiveRecord #:nodoc:
           execute "DROP VIEW #{quote_table_name(name)}"
         end
 
-        # Return the list of all views in the schema search path.
-        def views(name=nil)
-          schemas = schema_search_path.split(/,\s*/).map { |p| quote(p) }.join(',')
-          query(<<~SQL, name).map { |row| row[0] }
-            SELECT viewname
-              FROM pg_views
-             WHERE schemaname IN (#{schemas})
-          SQL
-        end
-
         # Checks whether relation +name+ is a view.
         def is_view?(name)
           result = query(<<~SQL, name).map { |row| row[0] }
@@ -252,11 +252,6 @@ module ActiveRecord #:nodoc:
           false
         end
 
-        def table_exists_with_updateable_views_inheritance_support?(name)
-          is_view?(name) ? true : table_exists_without_updateable_views_inheritance_support?(name)
-        end
-        alias_method_chain :table_exists?, :updateable_views_inheritance_support
-
         module Tutuf #:nodoc:
           class ClassTableReflection
             class << self
@@ -393,7 +388,7 @@ module ActiveRecord #:nodoc:
         end
 
         def parent_table(relation)
-          if table_exists?('updateable_views_inheritance')
+          if data_source_exists?('updateable_views_inheritance')
            res = query(<<-SQL, 'Parent relation')[0]
               SELECT parent_relation
                 FROM updateable_views_inheritance

data/lib/updateable_views_inheritance/version.rb

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

data/lib/updateable_views_inheritance.rb

@@ -1,5 +1,5 @@
 require 'active_record'
 require 'active_record/connection_adapters/postgresql_adapter'
 require "updateable_views_inheritance/version"
-require "updateable_views_inheritance/active_record"
+require "updateable_views_inheritance/active_record_extensions"
 require 'updateable_views_inheritance/postgresql_adapter'

data/test/deep_hierarchy_test.rb

@@ -3,6 +3,8 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 class DeepHierarchyTest < ActiveSupport::TestCase
   def setup
     ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 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)
@@ -10,10 +12,6 @@ class DeepHierarchyTest < ActiveSupport::TestCase
     @connection = ActiveRecord::Base.connection
   end
 
-  def teardown
-    ActiveRecord::FixtureSet.reset_cache
-  end
-
   def test_deeper_hierarchy
     assert_equal [["boats"], ["railed_vehicles", ["trains", ["steam_trains"], ["rack_trains"], ["electric_trains", ["maglev_trains"]]]], ["wheeled_vehicles", ["bicycles"], ["cars"]]].sort,
                   @connection.send(:get_view_hierarchy_for, :vehicles).sort
@@ -43,10 +41,10 @@ class DeepHierarchyTest < ActiveSupport::TestCase
 
   def test_single_table_inheritance_deeper_hierarchy_contents
     mag = MaglevTrain.first
-    assert_equal [mag.id.to_s, mag.name, mag.number_of_rails.to_s, mag.max_speed.to_s, mag.magnetic_field.to_s, (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, (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)
   end
 
-  class OrderColumnsInAggregateView < ActiveRecord::Migration
+  class OrderColumnsInAggregateView < ActiveRecord::Migration[4.2]
     def self.up
       rebuild_single_table_inheritance_view(:all_vehicles,:vehicles, %w(max_speed number_of_wheels id))
     end

data/test/dummy/app/models/locomotive.rb

@@ -1,3 +1,2 @@
 class Locomotive < ActiveRecord::Base
-  abstract_class = true
 end

data/test/dummy/app/models/vehicle.rb

@@ -1,4 +1,3 @@
 class Vehicle < ActiveRecord::Base
-  abstract_class = true
   self.inheritance_column = :vehicle_type
-end
+end

data/test/dummy/config/environments/test.rb

@@ -8,8 +8,8 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-class DefaultColumnValues < ActiveRecord::Migration
+class DefaultColumnValues < ActiveRecord::Migration[4.2]
   def self.up
     create_child(:rack_locomotives, :parent => :locomotives) do |t|
       t.column :bidirectional, :boolean, :default => false
@@ -6,8 +6,8 @@ class DefaultColumnValues < ActiveRecord::Migration
       t.column :rail_system, :string, :default => 'Abt'
     end
   end
-  
+
   def self.down
     drop_child  :rack_locomotives
   end
-end
+end

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

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

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

@@ -1,4 +1,4 @@
-class SecondDeepHierarchy < ActiveRecord::Migration
+class SecondDeepHierarchy < ActiveRecord::Migration[4.2]
   # Create tables and views for the following inheritance hierarchy:
   #
   #                               vehicles
@@ -18,32 +18,32 @@ class SecondDeepHierarchy < ActiveRecord::Migration
       t.column :name, :string
       t.column :vehicle_type, :string
     end
-    
+
     create_child(:wheeled_vehicles, :parent => :vehicles) do |t|
       t.column :number_of_wheels, :integer
     end
-    
+
     create_child(:bicycles, :parent => :wheeled_vehicles) do |t|
       t.column :number_of_gears, :integer
     end
-    
+
     create_child(:cars, :parent => :wheeled_vehicles) do |t|
       t.column :number_of_doors, :integer
     end
-    
+
     create_child(:railed_vehicles, :parent => :vehicles) do |t|
       t.column :number_of_rails, :integer
     end
-    
+
     create_child(:trains, :parent => :railed_vehicles) do |t|
       t.column :max_speed, :integer
     end
-  
+
     create_child(:steam_trains, :parent => :trains) do |t|
       t.column :water_consumption, :decimal, :precision => 6, :scale => 2
       t.column :coal_consumption,  :decimal, :precision => 6, :scale => 2
     end
-    
+
     create_child(:rack_trains, :parent => :trains) do |t|
       t.column :bidirectional, :boolean, :default => false
       t.column :narrow_gauge, :boolean, :default => true
@@ -53,7 +53,7 @@ class SecondDeepHierarchy < ActiveRecord::Migration
     create_child(:electric_trains, :parent => :trains) do |t|
       t.column :electricity_consumption, :decimal, :precision => 6, :scale => 2
     end
-    
+
     create_child(:maglev_trains, :parent => :electric_trains) do |t|
       t.column :magnetic_field, :integer
     end
@@ -62,9 +62,9 @@ class SecondDeepHierarchy < ActiveRecord::Migration
       t.column :mast_number, :integer
     end
   end
-  
+
   def self.down
     %w(boats maglev_trains electric_trains steam_trains rack_trains trains railed_vehicles cars bicycles wheeled_vehicles).each{|child| drop_child(child)}
     drop_table :vehicles
   end
-end
+end

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

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

data/test/instantiation_test.rb

@@ -3,11 +3,12 @@ require_relative 'test_helper'
 class InstantiationTest < ActiveSupport::TestCase
   def setup
     ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 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|
       ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', f)
     end
-    @connection = ActiveRecord::Base.connection
 
     Locomotive.disable_inheritance_instantiation = true
     ElectricLocomotive.disable_inheritance_instantiation = false
@@ -15,7 +16,6 @@ class InstantiationTest < ActiveSupport::TestCase
 
   def teardown
     Locomotive.disable_inheritance_instantiation = false
-    ActiveRecord::FixtureSet.reset_cache
   end
 
   # FIXME: flaky test_setting_disable_inheritance_instantiation_does_not_load_child_columns

data/test/migration_test.rb

@@ -22,7 +22,8 @@ class UpdateableViewsInheritanceMigrationTest < ActiveSupport::TestCase
     ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 3)
     ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 2)
     assert_equal %w(steam_locomotives), @connection.views.sort
-    assert_equal %w(locomotives
+    assert_equal %w(ar_internal_metadata
+                    locomotives
                     schema_migrations
                     steam_locomotives_data
                     updateable_views_inheritance), @connection.tables.sort

data/test/pg_insert_returning_with_rules_test.rb

@@ -0,0 +1,60 @@
+require_relative 'test_helper'
+
+class InsertReturningOnViewWithRulesAndDefaultValue < ActiveSupport::TestCase
+  def setup
+    @conn = ActiveRecord::Base.connection.raw_connection
+    @conn.exec("SET client_min_messages TO 'ERROR'")
+
+    @conn.exec(<<-SQL.squish)
+      CREATE TABLE parent (
+        id SERIAL PRIMARY KEY,
+        name TEXT
+      )
+    SQL
+
+    @conn.exec(<<-SQL.squish)
+      CREATE TABLE child (
+        parent_id INTEGER PRIMARY KEY REFERENCES parent(id),
+        surname TEXT
+      )
+    SQL
+
+    @conn.exec(<<-SQL.squish)
+      CREATE VIEW v AS (
+        SELECT id, name, surname
+        FROM parent JOIN child ON parent.id=child.parent_id
+      )
+    SQL
+
+    @conn.exec(<<-SQL.squish)
+     ALTER VIEW v ALTER id SET DEFAULT nextval('parent_id_seq'::regclass)
+    SQL
+
+    @conn.exec(<<-SQL.squish)
+      CREATE RULE v_on_insert AS ON INSERT TO v DO INSTEAD (
+        INSERT INTO parent (id, name)
+          VALUES( DEFAULT, NEW.name );
+        INSERT INTO child  (parent_id, surname)
+          VALUES( currval('parent_id_seq'), NEW.surname ) RETURNING parent_id, NULL::text, NULL::text;
+      )
+    SQL
+
+    @sql = "INSERT INTO v (name, surname) VALUES ('parent', 'child') RETURNING id"
+  end
+
+  def teardown
+    @conn.exec("DROP VIEW IF EXISTS v")
+    @conn.exec("DROP TABLE IF EXISTS parent CASCADE")
+    @conn.exec("DROP TABLE IF EXISTS child CASCADE")
+  end
+
+  def test_async_exec_with_empty_binds
+    res = @conn.async_exec(@sql, [])
+    assert_equal [[1]], res.values
+  end
+
+  def test_async_exec_with_no_binds
+    res = @conn.async_exec(@sql)
+    assert_equal [[1]], res.values
+  end
+end

data/test/schema_test.rb

@@ -7,7 +7,48 @@ class SchemaTest < ActiveSupport::TestCase
   end
 
   def test_pk_and_sequence_for
-    assert_equal ['id', 'public.locomotives_id_seq'], @connection.pk_and_sequence_for(:maglev_locomotives), "Could not get pk and sequence for child aggregate view"
+    pk, seq = @connection.pk_and_sequence_for(:maglev_locomotives)
+    assert_equal 'id', pk
+    assert_equal 'public.locomotives_id_seq', seq.to_s
+  end
+
+  class CreateChildInSchemaWithPublicParent < ActiveRecord::Migration[4.2]
+    def self.up
+      execute "CREATE SCHEMA interrail"
+      create_child('interrail.steam_locomotives', parent: 'locomotives') do |t|
+        t.decimal :interrail_water_consumption, precision: 6, scale: 2
+        t.decimal :interrail_coal_consumption,  precision: 6, scale: 2
+      end
+    end
+  end
+
+  def test_pk_and_sequence_for_child_and_parent_in_different_schemas
+    CreateChildInSchemaWithPublicParent.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
+      execute "CREATE SCHEMA interrail"
+      create_table 'interrail.locomotives' do |t|
+        t.column :interrail_name, :string
+        t.column :interrail_max_speed, :integer
+        t.column :type, :string
+      end
+      create_child('interrail.steam_locomotives', parent: 'interrail.locomotives') do |t|
+        t.decimal :interrail_water_consumption, precision: 6, scale: 2
+        t.decimal :interrail_coal_consumption,  precision: 6, scale: 2
+      end
+    end
+  end
+
+  def test_pk_and_sequence_for_child_and_parent_in_same_nonpublic_schema
+    CreateChildInSchemaWithParentInSchema.up
+    pk, seq = @connection.pk_and_sequence_for('interrail.steam_locomotives')
+    assert_equal 'id', pk
+    assert_equal 'interrail.locomotives_id_seq', seq.to_s
   end
 
   def test_primary_key
@@ -23,7 +64,7 @@ class SchemaTest < ActiveSupport::TestCase
                  @connection.views.sort
   end
 
-  class ParentTableWithOnlyOneColumn < ActiveRecord::Migration
+  class ParentTableWithOnlyOneColumn < ActiveRecord::Migration[4.2]
     def self.up
       create_table(:parent_pk_only){}
       create_table :child_data do |t|
@@ -46,7 +87,7 @@ class SchemaTest < ActiveSupport::TestCase
     ParentTableWithOnlyOneColumn.down
   end
 
-  class ChildTableWithOnlyOneColumn < ActiveRecord::Migration
+  class ChildTableWithOnlyOneColumn < ActiveRecord::Migration[4.2]
     def self.up
       create_table :parent do |t|
         t.column :name, :string
@@ -91,7 +132,7 @@ class SchemaTest < ActiveSupport::TestCase
     assert SteamLocomotive.columns.find { |c| c.name == 'water_consumption' }.null
   end
 
-  class ChangeDefaultValueOfColumn < ActiveRecord::Migration
+  class ChangeDefaultValueOfColumn < ActiveRecord::Migration[4.2]
     def self.up
       remove_parent_and_children_views(:rack_locomotives)
       change_column_default(:rack_locomotives_data, :rail_system, 'Marsh')
@@ -105,7 +146,7 @@ class SchemaTest < ActiveSupport::TestCase
     assert_equal 'Marsh', RackLocomotive.new.rail_system
   end
 
-  class RemoveChildrenViews < ActiveRecord::Migration
+  class RemoveChildrenViews < ActiveRecord::Migration[4.2]
     def self.up
       remove_parent_and_children_views(:locomotives)
     end
@@ -116,7 +157,7 @@ class SchemaTest < ActiveSupport::TestCase
     assert @connection.views.empty?
   end
 
-  class RemoveColumnInParentTable < ActiveRecord::Migration
+  class RemoveColumnInParentTable < ActiveRecord::Migration[4.2]
     def self.up
       remove_parent_and_children_views(:locomotives)
       remove_column(:locomotives, :max_speed)
@@ -132,7 +173,7 @@ class SchemaTest < ActiveSupport::TestCase
                  @connection.columns(:maglev_locomotives).map{ |c| c.name }.sort
   end
 
-  class RenameColumnInParentTable < ActiveRecord::Migration
+  class RenameColumnInParentTable < ActiveRecord::Migration[4.2]
     def self.up
       ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :electric_locomotives)
       ActiveRecord::FixtureSet.create_fixtures(File.dirname(__FILE__) + '/fixtures/', :maglev_locomotives)
@@ -153,7 +194,7 @@ class SchemaTest < ActiveSupport::TestCase
 
   end
 
-  class AddColumnToParentTable < ActiveRecord::Migration
+  class AddColumnToParentTable < ActiveRecord::Migration[4.2]
     def self.up
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
       rebuild_parent_and_children_views(:electric_locomotives)
@@ -169,7 +210,7 @@ class SchemaTest < ActiveSupport::TestCase
 
   end
 
-  class ChangeChildRelationView < ActiveRecord::Migration
+  class ChangeChildRelationView < ActiveRecord::Migration[4.2]
     def self.up
       remove_parent_and_children_views(:electric_locomotives)
       rename_column(:raw_electric_locomotives, :electricity_consumption, :electric_consumption)
@@ -183,7 +224,7 @@ class SchemaTest < ActiveSupport::TestCase
                  @connection.columns(:electric_locomotives).map{ |c| c.name }.sort
   end
 
-  class ChangeColumnInChildTable < ActiveRecord::Migration
+  class ChangeColumnInChildTable < ActiveRecord::Migration[4.2]
     def self.up
       drop_view(:steam_locomotives)
       rename_column(:steam_locomotives_data, :coal_consumption, :fuel_consumption)
@@ -197,11 +238,7 @@ class SchemaTest < ActiveSupport::TestCase
                  @connection.columns(:steam_locomotives).map(&:name).sort
   end
 
-  def test_table_exists
-    #TODO: test table_exists? monkey patch
-  end
-
-  class CreateChildInSchema < ActiveRecord::Migration
+  class CreateChildInSchema < ActiveRecord::Migration[4.2]
     def self.up
       execute "CREATE SCHEMA interrail"
       create_table 'interrail.locomotives' do |t|
@@ -227,7 +264,7 @@ class SchemaTest < ActiveSupport::TestCase
                  @connection.columns('interrail.steam_locomotives').map(&:name).sort
   end
 
-  class ChangeTablesInTwoInheritanceChains < ActiveRecord::Migration
+  class ChangeTablesInTwoInheritanceChains < ActiveRecord::Migration[4.2]
     def self.up
       add_column(:maglev_locomotives_data, :levitation_height, :integer)
       add_column(:bicycles_data, :wheel_size, :integer)
@@ -246,7 +283,7 @@ class SchemaTest < ActiveSupport::TestCase
            "Newly added column not present in view after rebuild for 2. hierarchy"
   end
 
-  class UseExistingTable < ActiveRecord::Migration
+  class UseExistingTable < ActiveRecord::Migration[4.2]
     def self.up
       create_table :tbl_diesel_locomotives do |t|
         t.belongs_to :locomotives
@@ -264,7 +301,7 @@ class SchemaTest < ActiveSupport::TestCase
     assert @connection.columns(:diesel_locomotives).map(&:name).include?("num_cylinders")
   end
 
-  class ReservedSQLWords < ActiveRecord::Migration
+  class ReservedSQLWords < ActiveRecord::Migration[4.2]
     def self.up
       create_child(:table, parent: :locomotives) do |t|
         t.integer :column
@@ -282,7 +319,7 @@ class SchemaTest < ActiveSupport::TestCase
     ReservedSQLWords.down
   end
 
-  class ChildTableIsActuallyView < ActiveRecord::Migration
+  class ChildTableIsActuallyView < ActiveRecord::Migration[4.2]
     def self.up
       execute <<-SQL.squish
         CREATE VIEW punk_locomotives_data AS (

data/test/single_table_inheritance_test.rb

@@ -30,7 +30,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
     assert_equal electric_locomotive.name, @connection.query("SELECT name FROm all_locomotives WHERE id=#{electric_locomotive.id}").first.first
   end
 
-  class AddColumnToParentTable < ActiveRecord::Migration
+  class AddColumnToParentTable < ActiveRecord::Migration[4.2]
     def self.up
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
       drop_view(:all_locomotives)
@@ -45,7 +45,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
 
-  class RemoveColumnInParentTable < ActiveRecord::Migration
+  class RemoveColumnInParentTable < ActiveRecord::Migration[4.2]
     def self.up
       drop_view(:all_locomotives)
       remove_parent_and_children_views(:locomotives)
@@ -61,7 +61,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
 
-  class RenameColumnInParentTable < ActiveRecord::Migration
+  class RenameColumnInParentTable < ActiveRecord::Migration[4.2]
     def self.up
       drop_view(:all_locomotives)
       remove_parent_and_children_views(:locomotives)
@@ -77,7 +77,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
 
-  class ChangeChildRelationView < ActiveRecord::Migration
+  class ChangeChildRelationView < ActiveRecord::Migration[4.2]
     def self.up
       drop_view(:all_locomotives)
       remove_parent_and_children_views(:electric_locomotives)
@@ -93,7 +93,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
                  @connection.columns(:all_locomotives).map{ |c| c.name }.sort
   end
 
-  class ConflictColumns < ActiveRecord::Migration
+  class ConflictColumns < ActiveRecord::Migration[4.2]
     def self.up
       drop_view(:all_locomotives)
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
@@ -111,7 +111,7 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
     assert_equal 'text', @connection.columns(:all_locomotives).detect{|c| c.name == "number_of_engines"}.sql_type
   end
 
-  class ConflictColumnsWithValues < ActiveRecord::Migration
+  class ConflictColumnsWithValues < ActiveRecord::Migration[4.2]
     def self.up
       add_column(:raw_electric_locomotives, :number_of_engines, :integer)
       add_column(:steam_locomotives_data, :number_of_engines, :string)

data/test/test_helper.rb

@@ -1,6 +1,9 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
+require 'warning'
+Warning.ignore(/.*in Ruby 3.*/)
+
 # test coverage
 require 'simplecov'
 require 'simplecov_json_formatter'

data/updateable_views_inheritance.gemspec

@@ -18,16 +18,17 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency "activerecord", "~> 4.2.8"
-  s.add_dependency "pg", "~> 0.21"
+  s.add_dependency "activerecord", "~> 5.0.7"
+  s.add_dependency "pg"
 
   s.add_development_dependency 'bigdecimal', '1.3.5'
   s.add_development_dependency "bundler"
   s.add_development_dependency "minitest"
   s.add_development_dependency "minitest-reporters"
-  s.add_development_dependency "rails", '= 4.2.11.1'
+  s.add_development_dependency "rails", '~> 5.0.7'
   s.add_development_dependency "rake"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "simplecov_json_formatter"
-  s.add_development_dependency "solargraph"
+  s.add_development_dependency "warning"
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: updateable_views_inheritance
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.5.0
 platform: ruby
 authors:
 - Sava Chankov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-06 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 5.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 5.0.7
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -99,16 +99,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.11.1
+        version: 5.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.11.1
+        version: 5.0.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solargraph
+  name: warning
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -187,7 +187,7 @@ files:
 - lib/generators/updateable_views_inheritance/install_generator.rb
 - lib/generators/updateable_views_inheritance/templates/create_updateable_views_inheritance.rb
 - lib/updateable_views_inheritance.rb
-- lib/updateable_views_inheritance/active_record.rb
+- lib/updateable_views_inheritance/active_record_extensions.rb
 - lib/updateable_views_inheritance/postgresql_adapter.rb
 - lib/updateable_views_inheritance/version.rb
 - tasks/updateable_views_inheritance_tasks.rake
@@ -261,7 +261,7 @@ files:
 - test/install_generator_test.rb
 - test/instantiation_test.rb
 - test/migration_test.rb
-- test/pg_insert_returning_with_rules_spec.rb
+- test/pg_insert_returning_with_rules_test.rb
 - test/schema_test.rb
 - test/single_table_inheritance_test.rb
 - test/test_helper.rb
@@ -360,7 +360,7 @@ test_files:
 - test/install_generator_test.rb
 - test/instantiation_test.rb
 - test/migration_test.rb
-- test/pg_insert_returning_with_rules_spec.rb
+- test/pg_insert_returning_with_rules_test.rb
 - test/schema_test.rb
 - test/single_table_inheritance_test.rb
 - test/test_helper.rb

data/lib/updateable_views_inheritance/active_record.rb

@@ -1,18 +0,0 @@
-module ActiveRecord #:nodoc:
-  class Base #:nodoc:
-    class << self
-      attr_accessor :disable_inheritance_instantiation
-
-      private
-      def instantiate_with_updateable_views_inheritance_support(attributes, column_types = {})
-        object = instantiate_without_updateable_views_inheritance_support(attributes, column_types = {})
-        if object.class.name == self.name || self.disable_inheritance_instantiation
-          object
-        else
-          object.class.find(attributes.with_indifferent_access[:id])
-        end
-      end
-      alias_method_chain :instantiate, :updateable_views_inheritance_support
-    end
-  end
-end

data/test/pg_insert_returning_with_rules_spec.rb

@@ -1,58 +0,0 @@
-gem "pg", "0.18.2"
-
-require "pg"
-require "rspec"
-
-describe "Insert returning on view with rules and default value" do
-  before(:each) do
-    @conn = PG.connect(dbname: 'updateable_views_inheritance_test')
-    @conn.exec(%q{ SET client_min_messages TO 'ERROR' })
-
-    @conn.exec(%q{ CREATE TABLE parent ( id SERIAL PRIMARY KEY,
-                                         name TEXT) })
-    @conn.exec(%q{ CREATE TABLE child ( parent_id INTEGER PRIMARY KEY REFERENCES parent(id),
-                                        surname TEXT) })
-
-    @conn.exec(%q{ CREATE VIEW v AS (SELECT id, name, surname FROM parent JOIN child ON parent.id=child.parent_id) })
-    @conn.exec(%q{ ALTER VIEW v ALTER id SET DEFAULT nextval('parent_id_seq'::regclass) })
-    #
-    # The old way that didn't return anything when binds are empty
-    #
-    # @conn.exec(%q{ CREATE RULE v_on_insert AS ON INSERT TO v DO INSTEAD
-    #               (
-    #                 SELECT setval('parent_id_seq', NEW.id);
-    #                 INSERT INTO parent (id, name)
-    #                   VALUES( currval('parent_id_seq'), NEW.name ) RETURNING id, name, NULL::text;
-    #                 INSERT INTO child  (parent_id, surname)
-    #                   VALUES( currval('parent_id_seq'), NEW.surname );
-    #
-    #               )
-    #             })
-    @conn.exec(%q{ CREATE RULE v_on_insert AS ON INSERT TO v DO INSTEAD
-                  (
-                    INSERT INTO parent (id, name)
-                      VALUES( DEFAULT, NEW.name );
-                    INSERT INTO child  (parent_id, surname)
-                      VALUES( currval('parent_id_seq'), NEW.surname ) RETURNING parent_id, NULL::text, NULL::te;
-                  )
-                })
-
-    @sql = %q{ INSERT INTO v (name, surname) VALUES ('parent', 'child') RETURNING id}
-  end
-
-  after(:each) do
-    @conn.exec(%q{ DROP VIEW IF EXISTS v })
-    @conn.exec(%q{ DROP TABLE IF EXISTS parent CASCADE})
-    @conn.exec(%q{ DROP TABLE IF EXISTS child CASCADE})
-  end
-
-  it 'async exec with empty binds' do
-    res = @conn.async_exec(@sql, [])
-    expect(res.values).to eq([["1"]])
-  end
-
-  it 'async exec with no binds' do
-    res = @conn.async_exec(@sql)
-    expect(res.values).to eq([["1"]])
-  end
-end