updateable_views_inheritance 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661b8ded59885a6e482cac9d0dfec5f9e1ab10050e3944b5f176e543958f8a33
-  data.tar.gz: fa8e6f63a74a28f9a09d1574ec6e3ae788df2ebdf3eead5789ef691c40337aed
+  metadata.gz: a7b78d1ecf36dad960f1b6ffccb8a640cbb9e1f06a8a8c1719f25f022e040aff
+  data.tar.gz: 2a3f41c5bb02ca8b2907c1a563cac2c4ed06429f712fed5f3b5f6ffcd988f34c
 SHA512:
-  metadata.gz: 1aec9cfeeb1aab4761e2efffc73219d7d9db7b605a8575fa470b5491783882415e51afdb8d7d48536242f0df4d2a448e8e3777c00ef9a65ec089001fb3e5a9e3
-  data.tar.gz: 46fb1b1a91344c01d55a48f47ef96e02f0d058a7f7781462c22cda18fa7d2a6eaa90f1e8cb94e7c1a03523c6d83d2aa500b43d4a83d011db0549bc65cfa4d9b6
+  metadata.gz: 33bbf8b1caf17c212f5f8f2712476f212cea3fd09c5d8ada27c6ee235bd1e8e65792afff98606daeb2c462756f21331f76597bc2f27dae17ecbcc90cfaa41ecc
+  data.tar.gz: b26957b4721cffcae777c4e9e7e7280f2a5ab2d1a008c00f551bb6c0db39fe7c6f19616570efde7d8cc8e18802d36814ce1fca80c6add8401571bc73a6e880bb

data/CHANGELOG.md

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

data/lib/updateable_views_inheritance/version.rb

@@ -1,3 +1,3 @@
 module UpdateableViewsInheritance
-  VERSION = "1.4.7"
+  VERSION = "1.4.8"
 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
+    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

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

@@ -29,5 +29,6 @@ Gem::Specification.new do |s|
   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.4.8
 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: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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:
     - - ">="