torque-postgresql 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5076bbdf3cee649de6955a308c0a51425755f5c87a2e83ee4b028a5009f6960f
-  data.tar.gz: ba7308a8927428a6496ef04b9edbd09270c303d43d0d10a9528033734a86fe2f
+  metadata.gz: 4164165e64b027d11997dde286684b27bd77c33634e3eb84c6f1c757b5d814a0
+  data.tar.gz: 8bf196d92b261661631ceb02f2ab7600a8a6cec5cacc43fa69b0c300afb65582
 SHA512:
-  metadata.gz: 4898d7f63ec4a7df180d3c4dcb80aab3d7269bcede0eab54a03f0c3591d314ddc025e45f755a9ae60a914d6cc4ecc8ca42011c44afbb62ec3432693a1abf8be0
-  data.tar.gz: a4621ea2a37aa566fcb33db4cdcaaf83b4539d96ed30628f81fda79f0b02c2c2ab1b197ef6e0448cbcdc43b584e53293ca110f3d299a0c6b13b89ff4f34aefcb
+  metadata.gz: 7e44fd4215ba1ef9d2aebf8d6a5c285266f0bb64544a2a74d36773aaaa8e57c5776c3260183352accf76f81e94edcba27ffa898145e4d0bb467f5097ce7e7467
+  data.tar.gz: 9c8acb15a0e78f33e8da372dcffc0e1a3e238631d01932056e5e48392801ec3706c3168a138944e5ebe7b80222f2f962e32af043a91c29235b6e824e02b70bbc

data/lib/torque/postgresql/adapter/schema_dumper.rb

@@ -49,21 +49,21 @@ module Torque
             if inherited_tables.present?
               stream.puts "  # These are tables that has inheritance"
               inherited_tables.each do |table_name, inherits|
-                unless ignored?(table_name)
-                  sub_stream = StringIO.new
-                  table(table_name, sub_stream)
-
-                  # Add the inherits setting
-                  sub_stream.rewind
-                  inherits.map!(&:to_sym)
-                  inherits = inherits.first if inherits.size === 1
-                  inherits = ", inherits: #{inherits.inspect} do |t|"
-                  table_dump = sub_stream.read.gsub(/ do \|t\|$/, inherits)
-
-                  # Ensure bodyless definitions
-                  table_dump.gsub!(/do \|t\|\n  end/, '')
-                  stream.print table_dump
-                end
+                next if ignored?(table_name)
+
+                sub_stream = StringIO.new
+                table(table_name, sub_stream)
+
+                # Add the inherits setting
+                sub_stream.rewind
+                inherits.map!(&:to_sym)
+                inherits = inherits.first if inherits.size === 1
+                inherits = ", inherits: #{inherits.inspect} do |t|"
+                table_dump = sub_stream.read.gsub(/ do \|t\|$/, inherits)
+
+                # Ensure bodyless definitions
+                table_dump.gsub!(/do \|t\|\n  end/, '')
+                stream.print table_dump
               end
             end
 
@@ -81,7 +81,7 @@ module Torque
             return unless types.any?
 
             stream.puts "  # These are user-defined types used on this database"
-            types.each { |name, type| send(type.to_sym, name, stream) }
+            types.sort_by(&:first).each { |(name, type)| send(type.to_sym, name, stream) }
             stream.puts
           rescue => e
             stream.puts "# Could not dump user-defined types because of following #{e.class}"

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/spec/tests/enum_spec.rb

@@ -124,6 +124,13 @@ RSpec.describe 'Enum' do
       expect(dump_io.string).to match /create_enum \"content_status\", \[/
     end
 
+    it 'sorts the enum entries to better consistency' do
+      dump_io = StringIO.new
+      ActiveRecord::SchemaDumper.dump(connection, dump_io)
+      items = dump_io.string.scan(/create_enum "(\w+)"/).flatten
+      expect(items).to be_eql(items.sort)
+    end
+
     it 'do not dump when has none' do
       connection.drop_type(:content_status, force: :cascade)
 

data/spec/tests/table_inheritance_spec.rb

@@ -231,6 +231,19 @@ RSpec.describe 'TableInheritance' do
       expect(child2.table_name).to eql('activity_books')
       expect(other.table_name).to eql('authors')
     end
+
+    it 'respects the table name prefix and sufix defined on parent module' do
+      mod = Object.const_set('Private', Module.new)
+      mod.define_singleton_method(:table_name_prefix) { 'private.' }
+      mod.define_singleton_method(:table_name_suffix) { '_bundle' }
+      result = 'private.activity_post_others_bundle'
+
+      klass = mod.const_set('Other', Class.new(ActivityPost))
+      allow(klass).to receive(:module_parent).and_return(child)
+      allow(klass).to receive(:module_parents).and_return([mod])
+      allow(klass).to receive(:physically_inherited?).and_return(true)
+      expect(klass.send(:compute_table_name)).to be_eql(result)
+    end
   end
 
   context 'on relation' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-23 00:00:00.000000000 Z
+date: 2020-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources
@@ -333,10 +333,9 @@ test_files:
 - spec/factories/videos.rb
 - spec/tests/geometric_builder_spec.rb
 - spec/tests/range_spec.rb
+- spec/tests/enum_spec.rb
 - spec/tests/auxiliary_statement_spec.rb
-- spec/tests/belongs_to_many_spec.rb
 - spec/tests/has_many_spec.rb
-- spec/tests/period_spec.rb
 - spec/tests/table_inheritance_spec.rb
 - spec/tests/coder_spec.rb
 - spec/tests/collector_spec.rb
@@ -347,7 +346,8 @@ test_files:
 - spec/tests/relation_spec.rb
 - spec/tests/arel_spec.rb
 - spec/tests/enum_set_spec.rb
-- spec/tests/enum_spec.rb
+- spec/tests/belongs_to_many_spec.rb
+- spec/tests/period_spec.rb
 - spec/mocks/cache_query.rb
 - spec/mocks/create_table.rb
 - spec/en.yml