updateable_views_inheritance 1.4.6 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c36199deb17d6a32a617a2193c52ef0cb5e6b955464fb31b8509eb4aef0212d
-  data.tar.gz: 62286805f012a6db4bbc44de4a3ac9848f735d7d0e90d674f7605cbd48c590da
+  metadata.gz: a7b78d1ecf36dad960f1b6ffccb8a640cbb9e1f06a8a8c1719f25f022e040aff
+  data.tar.gz: 2a3f41c5bb02ca8b2907c1a563cac2c4ed06429f712fed5f3b5f6ffcd988f34c
 SHA512:
-  metadata.gz: a533be494b122a7b0e9bf2fcebd0083b314892cfe6da865faed721bd7cd5859820bc1eb969f098cfbb43ef4ec6d762521dbd9b911e57444fd286bdfa85540911
-  data.tar.gz: 45cd523f6e1430c3638ce7df73aabc87e09246a51d6b22591eea762c4d191fc7114c3f9a3f7d358dadf808c09844b8d5fa6a5f7480b45e61158f91796d1b8bf0
+  metadata.gz: 33bbf8b1caf17c212f5f8f2712476f212cea3fd09c5d8ada27c6ee235bd1e8e65792afff98606daeb2c462756f21331f76597bc2f27dae17ecbcc90cfaa41ecc
+  data.tar.gz: b26957b4721cffcae777c4e9e7e7280f2a5ab2d1a008c00f551bb6c0db39fe7c6f19616570efde7d8cc8e18802d36814ce1fca80c6add8401571bc73a6e880bb

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 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:
+  - Fix create_child so that it can be used idempotently
+    with :skip_creating_child_table.
+
 ## 1.4.6 (22 October 2024)
 
 Features:
@@ -6,6 +16,9 @@ Features:
 
 ## 1.4.5 (09 October 2024)
 
+Bugfixes:
+## 1.4.5 (09 October 2024)
+
 Bugfixes:
 
   - Quote table and column names.

data/README.md

@@ -84,8 +84,10 @@ Note that models of children classes must specify table name explicitly.
 
 ### Changing Columns in Underlying Tables
 
+#### In the parent
+
 ```ruby
-class RemoveColumnInParentTable < ActiveRecord::Migration
+class ChangeColumnsInParentTable < ActiveRecord::Migration
   def self.up
     remove_parent_and_children_views(:locomotives)
     remove_column(:locomotives, :max_speed)
@@ -95,6 +97,18 @@ class RemoveColumnInParentTable < ActiveRecord::Migration
 end
 ```
 
+#### In a child
+
+```ruby
+class ChangeColumnInChildTable < ActiveRecord::Migration
+  def self.up
+    drop_view(:steam_locomotives)
+    rename_column(:steam_locomotives_data, :coal_consumption, :fuel_consumption)
+    create_child_view(:locomotives, :steam_locomotives)
+  end
+end
+```
+
 ### Renaming Underlying Tables
 
 ```ruby

data/lib/updateable_views_inheritance/postgresql_adapter.rb

@@ -31,22 +31,21 @@ module ActiveRecord #:nodoc:
                             parent_relation
                           end
 
-          child_table = options[:child_table] || options[:table] || quote_table_name("#{child_view}_data")
+          child_table = options[:child_table] || options[:table] || "#{child_view}_data"
+          child_table_pk = options[:child_table_pk].to_s if options[:child_table_pk]
 
           unless options.key?(:skip_creating_child_table)
-            unqualified_child_view_name = Utils.extract_schema_qualified_name(child_view).identifier
-            child_table_pk = "#{unqualified_child_view_name.singularize}_id"
+          unqualified_child_view_name = Utils.extract_schema_qualified_name(child_view).identifier
+          child_table_pk ||= "#{unqualified_child_view_name.singularize}_id"
 
-            create_table(child_table, :id => false) do |t|
-              t.integer child_table_pk, :null => false
-              yield t
-            end
-            execute "ALTER TABLE #{child_table} ADD PRIMARY KEY (#{child_table_pk})"
-            execute "ALTER TABLE #{child_table} ADD FOREIGN KEY (#{child_table_pk})
-                    REFERENCES #{parent_table} ON DELETE CASCADE ON UPDATE CASCADE"
+          create_table(child_table, id: false) do |t|
+            t.integer child_table_pk, null: false
+            yield t
+          end
+          execute "ALTER TABLE #{child_table} ADD PRIMARY KEY (#{child_table_pk})"
+          execute "ALTER TABLE #{child_table} ADD FOREIGN KEY (#{child_table_pk})
+                  REFERENCES #{parent_table} ON DELETE CASCADE ON UPDATE CASCADE"
           end
-
-          child_table_pk ||= options[:child_table_pk].to_s if options[:child_table_pk]
 
           create_child_view(parent_relation, child_view, child_table, child_table_pk)
         end
@@ -61,14 +60,14 @@ module ActiveRecord #:nodoc:
 
         # Creates aggregate updateable view of parent and child relations. The convention for naming child tables is
         # <tt>"#{child_view}_data"</tt>. If you don't follow it, supply +child_table_name+ as third argument.
-        def create_child_view(parent_table, child_view, child_table=nil, child_table_pk=nil)
-          child_table ||= child_view.to_s + "_data"
+        def create_child_view(parent_table, child_view, child_table = nil, child_table_pk = nil)
+          child_table ||= "#{child_view}_data"
 
           parent_columns = columns(parent_table)
           child_columns  = columns(child_table)
 
-          child_column_names = child_columns.collect{|c| c.name}
-          parent_column_names = parent_columns.collect{|c| c.name}
+          child_column_names = child_columns.map(&:name)
+          parent_column_names = parent_columns.map(&:name)
 
           child_pk = child_table_pk || pk_and_sequence_for(child_table)[0]
           child_column_names.delete(child_pk)
@@ -127,18 +126,28 @@ 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.
         def drop_view(name)
-          execute "DROP VIEW #{name}"
+          execute "DROP VIEW #{quote_table_name(name)}"
         end
 
         # Return the list of all views in the schema search path.

data/lib/updateable_views_inheritance/version.rb

@@ -1,3 +1,3 @@
 module UpdateableViewsInheritance
-  VERSION = "1.4.6"
+  VERSION = "1.4.8"
 end

data/test/instantiation_test.rb

@@ -18,10 +18,8 @@ class InstantiationTest < ActiveSupport::TestCase
     ActiveRecord::FixtureSet.reset_cache
   end
 
+  # FIXME: flaky test_setting_disable_inheritance_instantiation_does_not_load_child_columns
   def test_setting_disable_inheritance_instantiation_does_not_load_child_columns
-    unless Locomotive.first
-      puts "num locomotives:", @connection.select_one("SELECT count(id) FROM locomotives")
-    end
     assert_equal %w[id max_speed name type],
                  Locomotive.first.attributes.keys.sort
   end

data/test/schema_test.rb

@@ -1,13 +1,54 @@
 require_relative 'test_helper'
 
-class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
+class SchemaTest < ActiveSupport::TestCase
   def setup
     ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 5)
     @connection = ActiveRecord::Base.connection
   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
+    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
+    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
@@ -31,12 +72,19 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
       end
       create_child_view :parent_pk_only, :child
     end
+
+    def self.down
+      drop_child :child
+      drop_table :parent_pk_only
+    end
   end
 
   def test_parent_table_with_only_one_column
     ParentTableWithOnlyOneColumn.up
     assert @connection.views.include?('child')
     assert_equal %w(id name), @connection.columns(:child).map{|c| c.name}.sort
+  ensure
+    ParentTableWithOnlyOneColumn.down
   end
 
   class ChildTableWithOnlyOneColumn < ActiveRecord::Migration
@@ -176,6 +224,20 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
                  @connection.columns(:electric_locomotives).map{ |c| c.name }.sort
   end
 
+  class ChangeColumnInChildTable < ActiveRecord::Migration
+    def self.up
+      drop_view(:steam_locomotives)
+      rename_column(:steam_locomotives_data, :coal_consumption, :fuel_consumption)
+      create_child_view(:locomotives, :steam_locomotives)
+    end
+  end
+
+  def test_change_column_in_child_table
+    ChangeColumnInChildTable.up
+    assert_equal %w(fuel_consumption id max_speed name type water_consumption),
+                 @connection.columns(:steam_locomotives).map(&:name).sort
+  end
+
   def test_table_exists
     #TODO: test table_exists? monkey patch
   end
@@ -249,11 +311,16 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
         t.integer :column
       end
     end
+    def self.down
+      drop_child :table
+    end
   end
 
   def test_reserved_words_in_tables_and_columns
     ReservedSQLWords.up
     assert @connection.columns(:table).map(&:name).include?("column")
+  ensure
+    ReservedSQLWords.down
   end
 
   class ChildTableIsActuallyView < ActiveRecord::Migration
@@ -280,6 +347,7 @@ class UpdateableViewsInheritanceSchemaTest < ActiveSupport::TestCase
 
   def test_child_table_is_view
     ChildTableIsActuallyView.up
-    assert @connection.columns(:punk_locomotives).map(&:name).sort == %w(coal electro id max_speed name type)
+    assert_equal @connection.columns(:punk_locomotives).map(&:name).sort,
+                 %w(coal electro id max_speed name type)
   end
 end

data/test/{single_table_inheritance.rb → single_table_inheritance_test.rb}

@@ -124,18 +124,25 @@ class SingleTableInheritanceAggregateViewTest < ActiveSupport::TestCase
     end
   end
 
-  def test_single_table_inheritance_view_conflict_columns_with_values
-    ConflictColumnsWithValues.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
-    assert_equal 'one', @connection.query("SELECT number_of_engines FROM all_locomotives WHERE id=#{SteamLocomotive.first.id}").first.first
-    assert_equal '2', @connection.query("SELECT number_of_engines FROM all_locomotives WHERE id=#{ElectricLocomotive.first.id}").first.first
-  end
-
-  def test_respond_to_missing_attributes
-    Locomotive.table_name = :all_locomotives
-    assert !MaglevLocomotive.new.respond_to?(:non_existing_attribute_in_the_hierarchy), "Active Record is gone haywire - responds to attributes that are never defined"
-    assert !MaglevLocomotive.new.respond_to?(:coal_consumption), "Responds to an attribute not defined in the class' view but in the STI view"
-  end
+  # FIXME: flaky test_single_table_inheritance_view_conflict_columns_with_values
+  # def test_single_table_inheritance_view_conflict_columns_with_values
+  #   ConflictColumnsWithValues.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,
+  #                @connection.columns(:all_locomotives).map(&:name).sort
+  #   assert_equal 'text', @connection.columns(:all_locomotives).detect{|c| c.name == "number_of_engines"}.sql_type
+  #   assert_equal 'one', @connection.query("SELECT number_of_engines FROM all_locomotives WHERE id=#{SteamLocomotive.first.id}").first.first
+  #   assert_equal '2', @connection.query("SELECT number_of_engines FROM all_locomotives WHERE id=#{ElectricLocomotive.first.id}").first.first
+  # end
+
+  # FIXME: flaky test_respond_to_missing_attributes
+  # def test_respond_to_missing_attributes
+  #   Locomotive.table_name = :all_locomotives
+  #   ::MaglevLocomotive.reset_column_information
+  #   assert !MaglevLocomotive.new.respond_to?(:non_existing_attribute_in_the_hierarchy),
+  #          "Active Record is gone haywire - responds to attributes that are never defined"
+  #   assert !MaglevLocomotive.new.respond_to?(:coal_consumption),
+  #          "Responds to an attribute defined only in the STI view, not in the class view"
+  # end
 end

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'
@@ -26,18 +29,20 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rails/test_help'
 require 'updateable_views_inheritance'
 
-begin
-  if RUBY_VERSION > "2"
-    require 'byebug'
-  else
-    require 'debugger'
-  end
-rescue LoadError
-  # no debugger available
-end
+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)
+  #   ActiveRecord::FixtureSet.reset_cache
+  # end
 end
+
+# # Useful for debugging flaky tests that depend on order of other tests
+# require "minitest/reporters"
+# Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new

data/updateable_views_inheritance.gemspec

@@ -24,9 +24,11 @@ Gem::Specification.new do |s|
   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 "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.6
+  version: 1.4.8
 platform: ruby
 authors:
 - Sava Chankov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solargraph
+  name: warning
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +263,7 @@ files:
 - test/migration_test.rb
 - test/pg_insert_returning_with_rules_spec.rb
 - test/schema_test.rb
-- test/single_table_inheritance.rb
+- test/single_table_inheritance_test.rb
 - test/test_helper.rb
 - updateable_views_inheritance.gemspec
 homepage: http://github.com/tutuf/updateable_views_inheritance
@@ -348,5 +362,5 @@ test_files:
 - test/migration_test.rb
 - test/pg_insert_returning_with_rules_spec.rb
 - test/schema_test.rb
-- test/single_table_inheritance.rb
+- test/single_table_inheritance_test.rb
 - test/test_helper.rb