rom-sql 1.3.5 → 2.0.0.beta1

data/spec/shared/users_and_tasks.rb

@@ -32,6 +32,10 @@ RSpec.shared_context 'users and tasks' do
       Integer :tag_id
       Integer :task_id
     end
+
+    conf.relation(:tasks) { schema(infer: true) }
+    conf.relation(:task_tags) { schema(infer: true) }
+    conf.relation(:tags) { schema(infer: true) }
   end
 
   before do |example|

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ require 'logger'
 require 'tempfile'
 
 begin
-  require 'pry-byebug'
+  require ENV['DEBUGGER'] || 'byebug'
 rescue LoadError
   require 'pry'
 end
@@ -59,11 +59,8 @@ SPEC_ROOT = root = Pathname(__FILE__).dirname
 
 TMP_PATH = root.join('../tmp')
 
-class ROM::SQL::Schema::Inferrer
-  def self.on_error(*)
-    # quiet in specs
-  end
-end
+# quiet in specs
+ROM::SQL::Relation.tap { |r| r.schema_inferrer(r.schema_inferrer.suppress_errors) }
 
 require 'dry/core/deprecations'
 Dry::Core::Deprecations.set_logger!(root.join('../log/deprecations.log'))

data/spec/support/helpers.rb

@@ -1,16 +1,13 @@
 module Helpers
-  def qualified_attribute(*args)
-    ROM::SQL::QualifiedAttribute[*args]
-  end
-
   def assoc_name(*args)
-    ROM::SQL::Association::Name[*args]
+    ROM::Relation::Name[*args]
   end
 
-  def define_schema(name, attrs)
+  def define_schema(name, attrs = [])
+    relation_name = ROM::Relation::Name.new(name)
     ROM::SQL::Schema.define(
-      name,
-      attributes: attrs.map { |key, value| value.meta(name: key, source: ROM::Relation::Name.new(name)) },
+      relation_name,
+      attributes: attrs.map { |key, value| value.meta(name: key, source: relation_name) },
       attr_class: ROM::SQL::Attribute
     )
   end
@@ -18,4 +15,10 @@ module Helpers
   def define_type(name, id, **opts)
     ROM::SQL::Attribute.new(ROM::Types.const_get(id).meta(name: name, **opts))
   end
+
+  def build_assoc(type, *args)
+    klass = Dry::Core::Inflector.classify(type)
+    definition = ROM::Associations::Definitions.const_get(klass).new(*args)
+    ROM::SQL::Associations.const_get(definition.type).new(definition, relations)
+  end
 end

data/spec/support/test_configuration.rb

@@ -0,0 +1,16 @@
+require 'rom/configuration'
+
+class TestConfiguration < ROM::Configuration
+  def relation(name, &block)
+    if registered_relation_names.include?(name)
+      setup.relation_classes.delete_if do |klass|
+        klass.relation_name.relation == name
+      end
+    end
+    super
+  end
+
+  def registered_relation_names
+    setup.relation_classes.map(&:relation_name).map(&:relation)
+  end
+end

data/spec/unit/plugin/associates_spec.rb

@@ -18,10 +18,6 @@ RSpec.describe ROM::SQL::Plugin::Associates do
     instance_double(ROM::SQL::Relation)
   end
 
-  let(:registry) do
-    Hash.new { |h, k| h.fetch(k.to_sym) }.update(posts: posts, tags: tags)
-  end
-
   let(:command_class) do
     Class.new(ROM::SQL::Commands::Create) do
       use :associates, tags: []
@@ -33,23 +29,22 @@ RSpec.describe ROM::SQL::Plugin::Associates do
   end
 
   let(:tags_assoc) do
-    ROM::SQL::Association::ManyToMany.new(:posts, :tags, through: :posts_tags)
+    ROM::SQL::Associations::ManyToMany.new(double(:definition).as_null_object, {})
   end
 
   let(:posts_assoc) do
-    ROM::SQL::Association::ManyToMany.new(:tags, :posts, through: :posts_tags)
+    ROM::SQL::Associations::ManyToMany.new(double(:definition).as_null_object, {})
   end
 
   before do
-    allow(posts).to receive(:__registry__).and_return(registry)
-    allow(associations).to receive(:try).and_yield(tags_assoc)
+    allow(associations).to receive(:[]).and_return(tags_assoc)
     allow(tags_assoc).to receive(:join_keys).and_return({})
   end
 
   shared_context 'associates result' do
     it 'inserts join tuples and returns child tuples with combine keys' do
-      expect(tags_assoc).to receive(:persist).with(registry, post_tuples, tag_tuples)
-      expect(tags_assoc).to receive(:parent_combine_keys).with(registry).and_return(%i[name tag])
+      expect(tags_assoc).to receive(:persist).with(post_tuples, tag_tuples)
+      expect(tags_assoc).to receive(:parent_combine_keys).and_return(%i[name tag])
 
       result = command.associate(post_tuples, tag_tuples, assoc: tags_assoc, keys: {})
 

data/spec/unit/plugin/pagination_spec.rb

@@ -17,13 +17,13 @@ RSpec.describe 'Plugin / Pagination', seeds: false do
     describe '#page' do
       it 'allow to call with stringify number' do
         expect {
-          container.relation(:users).page('5')
+          container.relations[:users].page('5')
         }.to_not raise_error
       end
 
       it 'preserves existing modifiers' do
         expect(
-          container.relation(:users).send(:where, name: 'User 2').page(1).to_a.size
+          container.relations[:users].send(:where, name: 'User 2').page(1).to_a.size
         ).to be(1)
       end
     end
@@ -31,12 +31,12 @@ RSpec.describe 'Plugin / Pagination', seeds: false do
     describe '#per_page' do
       it 'allow to call with stringify number' do
         expect {
-          container.relation(:users).per_page('5')
+          container.relations[:users].per_page('5')
         }.to_not raise_error
       end
 
       it 'returns paginated relation with provided limit' do
-        users = container.relation(:users).page(2).per_page(5)
+        users = container.relations[:users].page(2).per_page(5)
 
         expect(users.dataset.opts[:offset]).to eql(5)
         expect(users.dataset.opts[:limit]).to eql(5)
@@ -54,19 +54,19 @@ RSpec.describe 'Plugin / Pagination', seeds: false do
 
     describe '#total_pages' do
       it 'returns a single page when elements are a perfect fit' do
-        users = container.relation(:users).page(1).per_page(3)
+        users = container.relations[:users].page(1).per_page(3)
         expect(users.pager.total_pages).to eql(3)
       end
 
       it 'returns the exact number of pages to accommodate all elements' do
-        users = container.relation(:users).per_page(9)
+        users = container.relations[:users].per_page(9)
         expect(users.pager.total_pages).to eql(1)
       end
     end
 
     describe '#pager' do
       it 'returns a pager with pagination meta-info' do
-        users = container.relation(:users).page(1)
+        users = container.relations[:users].page(1)
 
         expect(users.pager.total).to be(9)
         expect(users.pager.total_pages).to be(3)
@@ -75,13 +75,13 @@ RSpec.describe 'Plugin / Pagination', seeds: false do
         expect(users.pager.next_page).to be(2)
         expect(users.pager.prev_page).to be(nil)
 
-        users = container.relation(:users).page(2)
+        users = container.relations[:users].page(2)
 
         expect(users.pager.current_page).to be(2)
         expect(users.pager.next_page).to be(3)
         expect(users.pager.prev_page).to be(1)
 
-        users = container.relation(:users).page(3)
+        users = container.relations[:users].page(3)
 
         expect(users.pager.next_page).to be(nil)
         expect(users.pager.prev_page).to be(2)

data/spec/unit/plugin/timestamp_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe 'Plugin / Timestamp' do
 
     it "applies timestamps by default" do
       time   = DateTime.now
-      result = container.command(:notes).create.call(text: "This is a test")
+      result = container.commands[:notes].create.call(text: "This is a test")
 
       created = DateTime.parse(result[:created_at].to_s)
       updated = DateTime.parse(result[:updated_at].to_s)
@@ -56,7 +56,7 @@ RSpec.describe 'Plugin / Timestamp' do
     end
 
     it "applies datestamps by default" do
-      result = container.command(:notes).create.call(text: "This is a test")
+      result = container.commands[:notes].create.call(text: "This is a test")
       expect(Date.parse(result[:written].to_s)).to eq Date.today
     end
 
@@ -64,7 +64,7 @@ RSpec.describe 'Plugin / Timestamp' do
       time = DateTime.now
       input = [{text: "note one"}, {text: "note two"}]
 
-      results = container.command(:notes).create_many.call(input)
+      results = container.commands[:notes].create_many.call(input)
 
       results.each do |result|
         created = DateTime.parse(result[:created_at].to_s)
@@ -74,10 +74,10 @@ RSpec.describe 'Plugin / Timestamp' do
     end
 
     it "only updates specified timestamps" do
-      initial = container.command(:notes).create.call(text: "testing")
+      initial = container.commands[:notes].create.call(text: "testing")
       sleep 1  # Unfortunate, but unless I start injecting clocks into the
                # command, this is needed to make sure the time actually changes
-      updated = container.command(:notes).update.call(text: "updated test").first
+      updated = container.commands[:notes].update.call(text: "updated test").first
 
       expect(updated[:created_at]).to eq initial[:created_at]
       expect(updated[:updated_at]).not_to eq initial[:updated_at]
@@ -86,8 +86,8 @@ RSpec.describe 'Plugin / Timestamp' do
     it "allows overriding timestamps" do |ex|
       tomorrow = (Time.now + (60 * 60 * 24))
 
-      container.command(:notes).create.call(text: "testing")
-      updated = container.command(:notes).update.call(text: "updated test", updated_at: tomorrow).first
+      container.commands[:notes].create.call(text: "testing")
+      updated = container.commands[:notes].update.call(text: "updated test", updated_at: tomorrow).first
 
       if jruby? && sqlite?(ex)
         expect(updated[:updated_at]).to eql(tomorrow.strftime('%Y-%m-%d %H:%M:%S.%6N'))
@@ -97,8 +97,8 @@ RSpec.describe 'Plugin / Timestamp' do
     end
 
     it "works with chained commands" do
-      create_user = container.command(:users).create.with(name: "John Doe")
-      create_note = container.command(:notes).create_with_user.with(text: "new note")
+      create_user = container.commands[:users].create.with(name: "John Doe")
+      create_note = container.commands[:notes].create_with_user.with(text: "new note")
 
       time   = DateTime.now
       command = create_user >> create_note

data/spec/unit/relation/dataset_spec.rb

@@ -17,7 +17,8 @@ RSpec.describe ROM::Relation, '#dataset' do
       end
 
       it 'uses schema to infer default dataset' do
-        expect(relation.dataset.sql).to eql(dataset.select(:id, :name).order(Sequel.qualify(:users, :id)).sql)
+        expect(relation.dataset.sql).
+          to eql(dataset.select(Sequel.qualify(:users, :id), Sequel.qualify(:users, :name)).order(Sequel.qualify(:users, :id)).sql)
       end
     end
 
@@ -31,17 +32,18 @@ RSpec.describe ROM::Relation, '#dataset' do
       end
 
       it 'uses schema to infer default dataset' do
-        expect(relation.dataset.sql).to eql(dataset.select(:id).order(Sequel.qualify(:users, :id)).sql)
+        expect(relation.dataset.sql).
+          to eql(dataset.select(Sequel.qualify(:users, :id)).order(Sequel.qualify(:users, :id)).sql)
       end
     end
 
-    context 'without schema' do
+    context 'with inferred schema' do
       before do
-        conf.relation(:users)
+        conf.relation(:users) { schema(infer: true) }
       end
 
       it 'selects all qualified columns and sorts by pk' do
-        expect(relation.dataset.sql).to eql(dataset.select(*relation.columns).order(Sequel.qualify(:users, :id)).sql)
+        expect(relation.dataset.sql).to eql(dataset.select(*relation.schema.qualified).order(Sequel.qualify(:users, :id)).sql)
       end
     end
   end

data/spec/unit/relation/inner_join_spec.rb

@@ -149,23 +149,10 @@ RSpec.describe ROM::Relation, '#inner_join' do
       end
 
       it 'joins by relation if association name differs from relation name' do
-        pending 'waits for support for joins by aliased relation'
-        result = puzzles.inner_join(users).select(:name, puzzles[:text])
+        result = puzzles.inner_join(users).select(users[:name], puzzles[:text])
 
-        expect(result.to_a).to eql([ name: 'Jane', title: "Jane's task" ])
+        expect(result.to_a).to eql([ name: 'Jane', text: "solved by Jane" ])
       end
     end
-
-    it 'raises error when column names are ambiguous' do
-      expect {
-        relation.inner_join(:tasks, user_id: :id).to_a
-      }.to raise_error(Sequel::DatabaseError, /ambiguous/)
-    end
-
-    it 'raises error when join arg is unsupported' do
-      expect {
-        relation.inner_join(421)
-      }.to raise_error(ArgumentError, /other/)
-    end
   end
 end

data/spec/unit/relation/primary_key_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe ROM::Relation, '#primary_key' do
 
     context 'without schema' do
       it 'returns :id by default' do
-        conf.relation(:users)
+        conf.relation(:users) { schema(infer: true) }
 
         expect(relation.primary_key).to be(:id)
       end

data/spec/unit/schema_spec.rb

@@ -1,21 +1,23 @@
 RSpec.describe ROM::SQL::Schema, :postgres do
   describe '#primary_key' do
     it 'returns primary key attributes' do
-      schema = Class.new(ROM::Relation[:sql]).schema do
+      schema_proc = Class.new(ROM::Relation[:sql]).schema do
         attribute :id, ROM::SQL::Types::Serial
       end
 
-      schema.finalize!
+      schema = schema_proc.call
+      schema.finalize_attributes!.finalize!
 
       expect(schema.primary_key).to eql([schema[:id]])
     end
 
     it 'returns empty array when there is no PK defined' do
-      schema = Class.new(ROM::Relation[:sql]).schema do
+      schema_proc = Class.new(ROM::Relation[:sql]).schema do
         attribute :id, ROM::SQL::Types::Int
       end
 
-      schema.finalize!
+      schema = schema_proc.call
+      schema.finalize_attributes!.finalize!
 
       expect(schema.primary_key).to eql([])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
@@ -67,25 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rom
+  name: rom-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 4.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 4.0.0.beta
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,18 +142,17 @@ files:
 - Rakefile
 - circle.yml
 - lib/rom-sql.rb
-- lib/rom/plugins/relation/sql/auto_combine.rb
 - lib/rom/plugins/relation/sql/auto_restrictions.rb
-- lib/rom/plugins/relation/sql/auto_wrap.rb
 - lib/rom/plugins/relation/sql/instrumentation.rb
 - lib/rom/sql.rb
-- lib/rom/sql/association.rb
-- lib/rom/sql/association/many_to_many.rb
-- lib/rom/sql/association/many_to_one.rb
-- lib/rom/sql/association/name.rb
-- lib/rom/sql/association/one_to_many.rb
-- lib/rom/sql/association/one_to_one.rb
-- lib/rom/sql/association/one_to_one_through.rb
+- lib/rom/sql/associations.rb
+- lib/rom/sql/associations/core.rb
+- lib/rom/sql/associations/many_to_many.rb
+- lib/rom/sql/associations/many_to_one.rb
+- lib/rom/sql/associations/one_to_many.rb
+- lib/rom/sql/associations/one_to_one.rb
+- lib/rom/sql/associations/one_to_one_through.rb
+- lib/rom/sql/associations/self_ref.rb
 - lib/rom/sql/attribute.rb
 - lib/rom/sql/commands.rb
 - lib/rom/sql/commands/create.rb
@@ -173,20 +166,23 @@ files:
 - lib/rom/sql/extensions.rb
 - lib/rom/sql/extensions/active_support_notifications.rb
 - lib/rom/sql/extensions/mysql.rb
-- lib/rom/sql/extensions/mysql/inferrer.rb
+- lib/rom/sql/extensions/mysql/attributes_inferrer.rb
 - lib/rom/sql/extensions/postgres.rb
+- lib/rom/sql/extensions/postgres/attributes_inferrer.rb
 - lib/rom/sql/extensions/postgres/commands.rb
-- lib/rom/sql/extensions/postgres/inferrer.rb
 - lib/rom/sql/extensions/postgres/types.rb
 - lib/rom/sql/extensions/rails_log_subscriber.rb
 - lib/rom/sql/extensions/sqlite.rb
-- lib/rom/sql/extensions/sqlite/inferrer.rb
+- lib/rom/sql/extensions/sqlite/attributes_inferrer.rb
 - lib/rom/sql/extensions/sqlite/types.rb
 - lib/rom/sql/function.rb
 - lib/rom/sql/gateway.rb
 - lib/rom/sql/group_dsl.rb
+- lib/rom/sql/index.rb
 - lib/rom/sql/migration.rb
+- lib/rom/sql/migration/inline_runner.rb
 - lib/rom/sql/migration/migrator.rb
+- lib/rom/sql/migration/schema_diff.rb
 - lib/rom/sql/migration/template.rb
 - lib/rom/sql/order_dsl.rb
 - lib/rom/sql/plugin/associates.rb
@@ -194,7 +190,6 @@ files:
 - lib/rom/sql/plugin/timestamps.rb
 - lib/rom/sql/plugins.rb
 - lib/rom/sql/projection_dsl.rb
-- lib/rom/sql/qualified_attribute.rb
 - lib/rom/sql/rake_task.rb
 - lib/rom/sql/relation.rb
 - lib/rom/sql/relation/reading.rb
@@ -203,13 +198,15 @@ files:
 - lib/rom/sql/restriction_dsl.rb
 - lib/rom/sql/schema.rb
 - lib/rom/sql/schema/associations_dsl.rb
-- lib/rom/sql/schema/dsl.rb
+- lib/rom/sql/schema/attributes_inferrer.rb
 - lib/rom/sql/schema/inferrer.rb
 - lib/rom/sql/spec/support.rb
 - lib/rom/sql/tasks/migration_tasks.rake
 - lib/rom/sql/transaction.rb
+- lib/rom/sql/type_extensions.rb
 - lib/rom/sql/types.rb
 - lib/rom/sql/version.rb
+- lib/rom/sql/wrap.rb
 - log/.gitkeep
 - rom-sql.gemspec
 - spec/extensions/postgres/attribute_spec.rb
@@ -217,19 +214,23 @@ files:
 - spec/extensions/postgres/types_spec.rb
 - spec/extensions/sqlite/types_spec.rb
 - spec/fixtures/migrations/20150403090603_create_carrots.rb
-- spec/integration/association/many_to_many/custom_fks_spec.rb
-- spec/integration/association/many_to_many/from_view_spec.rb
-- spec/integration/association/many_to_many_spec.rb
-- spec/integration/association/many_to_one/custom_fks_spec.rb
-- spec/integration/association/many_to_one/from_view_spec.rb
-- spec/integration/association/many_to_one/self_ref_spec.rb
-- spec/integration/association/many_to_one_spec.rb
-- spec/integration/association/one_to_many/custom_fks_spec.rb
-- spec/integration/association/one_to_many/from_view_spec.rb
-- spec/integration/association/one_to_many/self_ref_spec.rb
-- spec/integration/association/one_to_many_spec.rb
-- spec/integration/association/one_to_one_spec.rb
-- spec/integration/association/one_to_one_through_spec.rb
+- spec/integration/associations/many_to_many/custom_fks_spec.rb
+- spec/integration/associations/many_to_many/from_view_spec.rb
+- spec/integration/associations/many_to_many_spec.rb
+- spec/integration/associations/many_to_one/custom_fks_spec.rb
+- spec/integration/associations/many_to_one/from_view_spec.rb
+- spec/integration/associations/many_to_one/self_ref_spec.rb
+- spec/integration/associations/many_to_one_spec.rb
+- spec/integration/associations/one_to_many/custom_fks_spec.rb
+- spec/integration/associations/one_to_many/from_view_spec.rb
+- spec/integration/associations/one_to_many/self_ref_spec.rb
+- spec/integration/associations/one_to_many_spec.rb
+- spec/integration/associations/one_to_one_spec.rb
+- spec/integration/associations/one_to_one_through_spec.rb
+- spec/integration/auto_migrations/errors_spec.rb
+- spec/integration/auto_migrations/indexes_spec.rb
+- spec/integration/auto_migrations/managing_columns_spec.rb
+- spec/integration/auto_migrations/postgres/column_types_spec.rb
 - spec/integration/commands/create_spec.rb
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/update_spec.rb
@@ -240,7 +241,6 @@ files:
 - spec/integration/plugins/associates/many_to_many_spec.rb
 - spec/integration/plugins/associates_spec.rb
 - spec/integration/plugins/auto_restrictions_spec.rb
-- spec/integration/plugins/auto_wrap_spec.rb
 - spec/integration/relation_schema_spec.rb
 - spec/integration/schema/call_spec.rb
 - spec/integration/schema/inferrer/mysql_spec.rb
@@ -255,6 +255,7 @@ files:
 - spec/integration/setup_spec.rb
 - spec/integration/support/active_support_notifications_spec.rb
 - spec/integration/support/rails_log_subscriber_spec.rb
+- spec/integration/wrap_spec.rb
 - spec/shared/accounts.rb
 - spec/shared/database_setup.rb
 - spec/shared/notes.rb
@@ -268,12 +269,7 @@ files:
 - spec/support/helpers.rb
 - spec/support/oracle/create_users.sql
 - spec/support/oracle/set_sys_passwords.sql
-- spec/unit/association/many_to_many_spec.rb
-- spec/unit/association/many_to_one_spec.rb
-- spec/unit/association/name_spec.rb
-- spec/unit/association/one_to_many_spec.rb
-- spec/unit/association/one_to_one_spec.rb
-- spec/unit/association/one_to_one_through_spec.rb
+- spec/support/test_configuration.rb
 - spec/unit/attribute_spec.rb
 - spec/unit/function_spec.rb
 - spec/unit/gateway_spec.rb
@@ -340,12 +336,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: SQL databases support for ROM
@@ -355,19 +351,23 @@ test_files:
 - spec/extensions/postgres/types_spec.rb
 - spec/extensions/sqlite/types_spec.rb
 - spec/fixtures/migrations/20150403090603_create_carrots.rb
-- spec/integration/association/many_to_many/custom_fks_spec.rb
-- spec/integration/association/many_to_many/from_view_spec.rb
-- spec/integration/association/many_to_many_spec.rb
-- spec/integration/association/many_to_one/custom_fks_spec.rb
-- spec/integration/association/many_to_one/from_view_spec.rb
-- spec/integration/association/many_to_one/self_ref_spec.rb
-- spec/integration/association/many_to_one_spec.rb
-- spec/integration/association/one_to_many/custom_fks_spec.rb
-- spec/integration/association/one_to_many/from_view_spec.rb
-- spec/integration/association/one_to_many/self_ref_spec.rb
-- spec/integration/association/one_to_many_spec.rb
-- spec/integration/association/one_to_one_spec.rb
-- spec/integration/association/one_to_one_through_spec.rb
+- spec/integration/associations/many_to_many/custom_fks_spec.rb
+- spec/integration/associations/many_to_many/from_view_spec.rb
+- spec/integration/associations/many_to_many_spec.rb
+- spec/integration/associations/many_to_one/custom_fks_spec.rb
+- spec/integration/associations/many_to_one/from_view_spec.rb
+- spec/integration/associations/many_to_one/self_ref_spec.rb
+- spec/integration/associations/many_to_one_spec.rb
+- spec/integration/associations/one_to_many/custom_fks_spec.rb
+- spec/integration/associations/one_to_many/from_view_spec.rb
+- spec/integration/associations/one_to_many/self_ref_spec.rb
+- spec/integration/associations/one_to_many_spec.rb
+- spec/integration/associations/one_to_one_spec.rb
+- spec/integration/associations/one_to_one_through_spec.rb
+- spec/integration/auto_migrations/errors_spec.rb
+- spec/integration/auto_migrations/indexes_spec.rb
+- spec/integration/auto_migrations/managing_columns_spec.rb
+- spec/integration/auto_migrations/postgres/column_types_spec.rb
 - spec/integration/commands/create_spec.rb
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/update_spec.rb
@@ -378,7 +378,6 @@ test_files:
 - spec/integration/plugins/associates/many_to_many_spec.rb
 - spec/integration/plugins/associates_spec.rb
 - spec/integration/plugins/auto_restrictions_spec.rb
-- spec/integration/plugins/auto_wrap_spec.rb
 - spec/integration/relation_schema_spec.rb
 - spec/integration/schema/call_spec.rb
 - spec/integration/schema/inferrer/mysql_spec.rb
@@ -393,6 +392,7 @@ test_files:
 - spec/integration/setup_spec.rb
 - spec/integration/support/active_support_notifications_spec.rb
 - spec/integration/support/rails_log_subscriber_spec.rb
+- spec/integration/wrap_spec.rb
 - spec/shared/accounts.rb
 - spec/shared/database_setup.rb
 - spec/shared/notes.rb
@@ -406,12 +406,7 @@ test_files:
 - spec/support/helpers.rb
 - spec/support/oracle/create_users.sql
 - spec/support/oracle/set_sys_passwords.sql
-- spec/unit/association/many_to_many_spec.rb
-- spec/unit/association/many_to_one_spec.rb
-- spec/unit/association/name_spec.rb
-- spec/unit/association/one_to_many_spec.rb
-- spec/unit/association/one_to_one_spec.rb
-- spec/unit/association/one_to_one_through_spec.rb
+- spec/support/test_configuration.rb
 - spec/unit/attribute_spec.rb
 - spec/unit/function_spec.rb
 - spec/unit/gateway_spec.rb