torque-postgresql 3.0.1 → 3.2.0

data/spec/tests/enum_set_spec.rb

@@ -43,18 +43,19 @@ RSpec.describe 'Enum' do
   end
 
   context 'on schema' do
+    let(:dump_result) do
+      ActiveRecord::SchemaDumper.dump(connection, (dump_result = StringIO.new))
+      dump_result.string
+    end
+
     it 'can be used on tables' do
-      dump_io = StringIO.new
       checker = /t\.enum +"conflicts", +array: true, +enum_type: "conflicts"/
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      expect(dump_io.string).to match checker
+      expect(dump_result).to match checker
     end
 
     xit 'can have a default value as an array of symbols' do
-      dump_io = StringIO.new
       checker = /t\.enum +"types", +default: \[:A, :B\], +array: true, +enum_type: "types"/
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      expect(dump_io.string).to match checker
+      expect(dump_result).to match checker
     end
   end
 

data/spec/tests/schema_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+RSpec.describe 'Schema' do
+  let(:connection) { ActiveRecord::Base.connection }
+
+  before do
+    connection.instance_variable_set(:@schmeas_blacklist, nil)
+    connection.instance_variable_set(:@schmeas_whitelist, nil)
+  end
+
+  context 'on migration' do
+    it 'can check for existance' do
+      expect(connection.schema_exists?(:information_schema)).to be_falsey
+      expect(connection.schema_exists?(:information_schema, filtered: false)).to be_truthy
+    end
+
+    it 'can be created' do
+      expect(connection.schema_exists?(:legacy, filtered: false)).to be_falsey
+      connection.create_schema(:legacy)
+      expect(connection.schema_exists?(:legacy, filtered: false)).to be_truthy
+    end
+
+    it 'can be deleted' do
+      expect(connection.schema_exists?(:legacy, filtered: false)).to be_falsey
+
+      connection.create_schema(:legacy)
+      expect(connection.schema_exists?(:legacy, filtered: false)).to be_truthy
+
+      connection.drop_schema(:legacy)
+      expect(connection.schema_exists?(:legacy, filtered: false)).to be_falsey
+    end
+
+    it 'works with whitelist' do
+      expect(connection.schema_exists?(:legacy)).to be_falsey
+      connection.create_schema(:legacy)
+
+      expect(connection.schema_exists?(:legacy)).to be_falsey
+      expect(connection.schema_exists?(:legacy, filtered: false)).to be_truthy
+
+      connection.schemas_whitelist.push('legacy')
+      expect(connection.schema_exists?(:legacy)).to be_truthy
+    end
+  end
+
+  context 'on schema' do
+    let(:dump_result) do
+      ActiveRecord::SchemaDumper.dump(connection, (dump_result = StringIO.new))
+      dump_result.string
+    end
+
+    it 'does not add when there is no extra schemas' do
+      connection.drop_schema(:internal, force: :cascade)
+      expect(dump_result).not_to match /Custom schemas defined in this database/
+    end
+
+    it 'does not include tables from blacklisted schemas' do
+      connection.schemas_blacklist.push('internal')
+      expect(dump_result).not_to match /create_table \"users\",.*schema: +"internal"/
+    end
+
+    context 'with internal schema whitelisted' do
+      before { connection.schemas_whitelist.push('internal') }
+
+      it 'dumps the schemas' do
+        expect(dump_result).to match /create_schema \"internal\"/
+      end
+
+      it 'shows the internal users table in the connection tables list' do
+        expect(connection.tables).to include('internal.users')
+      end
+
+      it 'dumps tables on whitelisted schemas' do
+        expect(dump_result).to match /create_table \"users\",.*schema: +"internal"/
+      end
+    end
+  end
+
+  context 'on relation' do
+    let(:model) { Internal::User }
+
+    it 'adds the schema to the query' do
+      expect(model.all.to_sql).to match(/FROM "internal"."users"/)
+    end
+
+    it 'can load the schema from the module' do
+      allow(Internal).to receive(:schema).and_return('internal')
+      allow(model).to receive(:schema).and_return(nil)
+
+      expect(model.all.to_sql).to match(/FROM "internal"."users"/)
+    end
+  end
+end

data/spec/tests/table_inheritance_spec.rb

@@ -73,37 +73,33 @@ RSpec.describe 'TableInheritance' do
   end
 
   context 'on schema' do
-    it 'dumps single inheritance with body' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
+    let(:dump_result) do
+      ActiveRecord::SchemaDumper.dump(connection, (dump_result = StringIO.new))
+      dump_result.string
+    end
 
+    it 'dumps single inheritance with body' do
       parts = '"activity_books"'
       parts << ', id: false'
       parts << ', force: :cascade'
-      parts << ', inherits: :activities'
-      expect(dump_io.string).to match(/create_table #{parts} do /)
+      parts << ', inherits: "activities"'
+      expect(dump_result).to match(/create_table #{parts} do /)
     end
 
     it 'dumps single inheritance without body' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-
       parts = '"activity_post_samples"'
       parts << ', id: false'
       parts << ', force: :cascade'
-      parts << ', inherits: :activity_posts'
-      expect(dump_io.string).to match(/create_table #{parts}(?! do \|t\|)/)
+      parts << ', inherits: "activity_posts"'
+      expect(dump_result).to match(/create_table #{parts}(?! do \|t\|)/)
     end
 
     it 'dumps multiple inheritance' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-
       parts = '"activity_posts"'
       parts << ', id: false'
       parts << ', force: :cascade'
-      parts << ', inherits: (\[:images, :activities\]|\[:activities, :images\])'
-      expect(dump_io.string).to match(/create_table #{parts}/)
+      parts << ', inherits: (\["images", "activities"\]|\["activities", "images"\])'
+      expect(dump_result).to match(/create_table #{parts}/)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Carlos Silva
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,7 +155,7 @@ dependencies:
 description: Add support to complex resources of PostgreSQL, like data types, array
   associations, and auxiliary statements (CTE)
 email:
-- carlinhus.fsilva@gmail.com
+- me@carlosfsilva.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -208,6 +208,7 @@ files:
 - lib/torque/postgresql/attributes/period.rb
 - lib/torque/postgresql/autosave_association.rb
 - lib/torque/postgresql/auxiliary_statement.rb
+- lib/torque/postgresql/auxiliary_statement/recursive.rb
 - lib/torque/postgresql/auxiliary_statement/settings.rb
 - lib/torque/postgresql/base.rb
 - lib/torque/postgresql/collector.rb
@@ -232,6 +233,7 @@ files:
 - lib/torque/postgresql/relation/inheritance.rb
 - lib/torque/postgresql/relation/merger.rb
 - lib/torque/postgresql/schema_cache.rb
+- lib/torque/postgresql/table_name.rb
 - lib/torque/postgresql/version.rb
 - spec/en.yml
 - spec/factories/authors.rb
@@ -250,10 +252,12 @@ files:
 - spec/models/activity_post/sample.rb
 - spec/models/author.rb
 - spec/models/author_journalist.rb
+- spec/models/category.rb
 - spec/models/comment.rb
 - spec/models/course.rb
 - spec/models/geometry.rb
 - spec/models/guest_comment.rb
+- spec/models/internal/user.rb
 - spec/models/item.rb
 - spec/models/post.rb
 - spec/models/question.rb
@@ -280,13 +284,18 @@ files:
 - spec/tests/period_spec.rb
 - spec/tests/quoting_spec.rb
 - spec/tests/relation_spec.rb
+- spec/tests/schema_spec.rb
 - spec/tests/table_inheritance_spec.rb
 homepage: https://github.com/crashtech/torque-postgresql
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/crashtech/torque-postgresql
+  bug_tracker_uri: https://github.com/crashtech/torque-postgresql/issues
 post_install_message:
-rdoc_options: []
+rdoc_options:
+- "--title"
+- Torque PostgreSQL
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -322,10 +331,12 @@ test_files:
 - spec/models/activity_post.rb
 - spec/models/author.rb
 - spec/models/author_journalist.rb
+- spec/models/category.rb
 - spec/models/comment.rb
 - spec/models/course.rb
 - spec/models/geometry.rb
 - spec/models/guest_comment.rb
+- spec/models/internal/user.rb
 - spec/models/item.rb
 - spec/models/post.rb
 - spec/models/question.rb
@@ -352,4 +363,5 @@ test_files:
 - spec/tests/period_spec.rb
 - spec/tests/quoting_spec.rb
 - spec/tests/relation_spec.rb
+- spec/tests/schema_spec.rb
 - spec/tests/table_inheritance_spec.rb