updateable_views_inheritance 1.5.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4134e2e8c505f5ca5c6d53762497a18b168b5cb43027a121f337908d1595d5b
-  data.tar.gz: 7dc39d94d346f6efef8862c2482afe72d97f745b822b59b313041dcb21fb9ebc
+  metadata.gz: 8cc7de06768bfaa7271e412ae2a2958b2eab9d67a82ea00f63937fee7819227e
+  data.tar.gz: 610d697e27f5c3a930ae3b73f9ca39d96e0306c1045d8bd7464d241612505662
 SHA512:
-  metadata.gz: e50eeaa1e8e686fe94bd47f02f8109335b7f38efa94e65c108dc5e0c5dcc7509e476ee14ce3de31160673d6bcce0f540dcbf0142f774b1db7f017ed106251b15
-  data.tar.gz: e2e3e32f9b7e6f77c113c1d80701f6a1345a4352df0779d5cfc3f450bfe11fe04c6b65955ba07de440c4733df71ba84073294f274e6c14e4b80fda1024391208
+  metadata.gz: 487871f182d767012231ca8bc56167bd6365f6bed2641c3ff1d9bd9dbb6ac2e2bca0104775403c614f75091e3b25501ed4671eaad4a343c90439cc5b73e87ffe
+  data.tar.gz: bf8a7d7d021ba1316351ec069ba36fa0fbe42a89262b58332f629082b703b249969c52237411b446e8c0b48b5fecef4ca0892a6c84a4c583c24e785bd317d1c9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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

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

data/lib/updateable_views_inheritance/version.rb

@@ -1,3 +1,3 @@
 module UpdateableViewsInheritance
-  VERSION = "1.5.1"
+  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,7 +41,7 @@ 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]

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/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
 
@@ -273,7 +273,7 @@ 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.new.up
 

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)

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.1.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.1.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.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Sava Chankov
@@ -9,22 +9,28 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-27 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.1.7
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.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.1.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.1.7
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement