rom-sql 1.3.5 → 2.0.0.beta1

data/spec/integration/{association → associations}/many_to_one/custom_fks_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe ROM::SQL::Association::ManyToOne, '#call' do
+RSpec.describe ROM::SQL::Associations::ManyToOne, '#call' do
   include_context 'database setup'
 
   before do
@@ -24,6 +24,8 @@ RSpec.describe ROM::SQL::Association::ManyToOne, '#call' do
         column :code, String, null: false
       end
 
+      conf.relation(:destinations) { schema(infer: true) }
+
       conf.relation(:flights) do
         schema(infer: true) do
           associations do
@@ -40,7 +42,7 @@ RSpec.describe ROM::SQL::Association::ManyToOne, '#call' do
     end
 
     it 'prepares joined relations using correct FKs based on association aliases' do
-      relation = assoc_from.call(relations)
+      relation = assoc_from.()
 
       expect(relation.schema.map(&:to_sql_name)).
         to eql([Sequel.qualify(:destinations, :id),
@@ -49,7 +51,7 @@ RSpec.describe ROM::SQL::Association::ManyToOne, '#call' do
 
       expect(relation.first).to eql(id: 1, name: 'FROM', flight_id: 1)
 
-      relation = assoc_to.call(relations)
+      relation = assoc_to.()
 
       expect(relation.schema.map(&:to_sql_name)).
         to eql([Sequel.qualify(:destinations, :id),

data/spec/integration/{association → associations}/many_to_one/from_view_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe ROM::SQL::Association::ManyToOne, '#call' do
+RSpec.describe ROM::SQL::Associations::ManyToOne, '#call' do
   include_context 'database setup'
 
   before do
@@ -58,7 +58,7 @@ RSpec.describe ROM::SQL::Association::ManyToOne, '#call' do
     end
 
     it 'prepares joined relations using custom view in target relation' do
-      relation = assoc_inter.call(relations)
+      relation = assoc_inter.()
 
       expect(relation.schema.map(&:to_sql_name)).
         to eql([Sequel.qualify(:destinations, :id),
@@ -69,7 +69,7 @@ RSpec.describe ROM::SQL::Association::ManyToOne, '#call' do
       expect(relation.first).to eql(id: 2, intermediate: db_true, name: 'Intermediate', flight_id: 1)
       expect(relation.count).to be(1)
 
-      relation = assoc_final.call(relations)
+      relation = assoc_final.()
 
       expect(relation.schema.map(&:to_sql_name)).
         to eql([Sequel.qualify(:destinations, :id),

data/spec/integration/{association → associations}/many_to_one/self_ref_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
+RSpec.describe ROM::SQL::Associations::ManyToOne, '#call' do
   subject(:assoc) do
     relations[:categories].associations[:parent]
   end
@@ -35,7 +35,7 @@ RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
     end
 
     it 'prepares joined relations using custom FK for a self-ref association' do
-      relation = assoc.call(relations)
+      relation = assoc.()
 
       expect(relation.schema.map(&:to_sql_name)).
         to eql([Sequel.qualify(:categories, :id),

data/spec/integration/{association → associations}/many_to_one_spec.rb

@@ -1,45 +1,36 @@
-RSpec.describe ROM::SQL::Association::ManyToOne, helpers: true do
+RSpec.describe ROM::SQL::Associations::ManyToOne, helpers: true do
   with_adapters do
     context 'common name conventions' do
       include_context 'users and tasks'
       include_context 'accounts'
 
-      subject(:assoc) {
-        ROM::SQL::Association::ManyToOne.new(:tasks, :users)
-      }
+      subject(:assoc) do
+        build_assoc(:many_to_one, :tasks, :users)
+      end
 
       before do
         conf.relation(:tasks) do
-          schema do
-            attribute :id, ROM::SQL::Types::Serial
-            attribute :user_id, ROM::SQL::Types::ForeignKey(:users)
-            attribute :title, ROM::SQL::Types::String
-          end
+          schema(infer: true)
         end
       end
 
-      describe '#result' do
-        specify { expect(ROM::SQL::Association::ManyToOne.result).to be(:one) }
-      end
-
       describe '#name' do
         it 'uses target by default' do
           expect(assoc.name).to be(:users)
         end
       end
 
-      describe '#target' do
-        it 'builds full relation name' do
-          assoc = ROM::SQL::Association::ManyToOne.new(:users, :tasks, relation: :foo)
+      describe '#result' do
+        specify { expect(assoc.result).to be(:one) }
+      end
 
-          expect(assoc.name).to be(:tasks)
-          expect(assoc.target).to eql(ROM::SQL::Association::Name[:foo, :tasks])
-        end
+      describe '#combine_keys' do
+        specify { expect(assoc.combine_keys).to eql(user_id: :id) }
       end
 
       describe '#call' do
         it 'prepares joined relations' do
-          relation = assoc.call(container.relations)
+          relation = assoc.(preload: false)
 
           expect(relation.schema.map(&:to_sql_name)).
             to eql([Sequel.qualify(:users, :id),
@@ -58,15 +49,11 @@ RSpec.describe ROM::SQL::Association::ManyToOne, helpers: true do
         end
       end
 
-      describe ROM::Plugins::Relation::SQL::AutoCombine, '#for_combine' do
+      describe '#eager_load' do
         it 'preloads relation based on association' do
-          relation = users.for_combine(assoc).call(tasks.call)
+          relation = users.eager_load(assoc).call(tasks.call)
 
-          expect(relation.to_a).
-            to eql([
-                     { id: 1, task_id: 2, name: 'Jane' },
-                     { id: 2, task_id: 1, name: 'Joe' }
-                   ])
+          expect(relation.to_a).to eql([{ id: 1, name: 'Jane' }, { id: 2, name: 'Joe' }])
         end
 
         it 'maintains original relation' do
@@ -76,11 +63,11 @@ RSpec.describe ROM::SQL::Association::ManyToOne, helpers: true do
                        join(:accounts, user_id: :id).
                        select_append(users.accounts[:number].as(:account_num)).
                        order(:account_num).
-                       for_combine(assoc).call(tasks.call)
+                       eager_load(assoc).call(tasks.call)
 
           expect(relation.to_a).
-            to eql([{ id: 2, task_id: 1, name: 'Joe', account_num: '31' },
-                    { id: 1, task_id: 2, name: 'Jane', account_num: '42' }])
+            to eql([{ id: 2, name: 'Joe', account_num: '31' },
+                    { id: 1, name: 'Jane', account_num: '42' }])
         end
       end
     end
@@ -93,23 +80,18 @@ RSpec.describe ROM::SQL::Association::ManyToOne, helpers: true do
       let(:articles) { container.relations[:articles] }
 
       subject(:assoc) do
-        ROM::SQL::Association::ManyToOne.new(articles_name, :users)
+        build_assoc(:many_to_one, articles_name, :users)
       end
 
       before do
         conf.relation(:articles) do
-          schema(:posts) do
-            attribute :post_id, ROM::SQL::Types::Serial
-            attribute :author_id, ROM::SQL::Types::ForeignKey(:users)
-            attribute :title, ROM::SQL::Types::Strict::String
-            attribute :body, ROM::SQL::Types::Strict::String
-          end
+          schema(:posts, infer: true)
         end
       end
 
       describe '#call' do
         it 'prepares joined relations' do
-          relation = assoc.call(container.relations)
+          relation = assoc.()
 
           expect(relation.schema.map(&:to_sql_name)).
             to eql([Sequel.qualify(:users, :id),

data/spec/integration/{association → associations}/one_to_many/custom_fks_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
+RSpec.describe ROM::SQL::Associations::OneToMany, '#call' do
   include_context 'users'
 
   before do
@@ -20,6 +20,8 @@ RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
         column :text, String, null: false
       end
 
+      conf.relation(:puzzles) { schema(infer: true) }
+
       conf.relation(:users) do
         schema(infer: true) do
           associations do
@@ -38,7 +40,7 @@ RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
     end
 
     it 'prepares joined relations using custom FK' do
-      relation = assoc.call(relations)
+      relation = assoc.()
 
       expect(relation.schema.map(&:to_sql_name)).
         to eql([Sequel.qualify(:puzzles, :id),

data/spec/integration/{association → associations}/one_to_many/from_view_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
+RSpec.describe ROM::SQL::Associations::OneToMany, '#call' do
   include_context 'users'
 
   before do
@@ -42,7 +42,7 @@ RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
     end
 
     it 'prepares joined relations using custom view' do
-      relation = assoc.call(relations)
+      relation = assoc.()
 
       expect(relation.schema.map(&:to_sql_name)).
         to eql([Sequel.qualify(:puzzles, :id),

data/spec/integration/{association → associations}/one_to_many/self_ref_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
+RSpec.describe ROM::SQL::Associations::OneToMany, '#call' do
   include_context 'database setup'
 
   before do
@@ -36,7 +36,7 @@ RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
     end
 
     it 'prepares joined relations using custom FK for a self-ref association' do
-      relation = assoc.call(relations)
+      relation = assoc.()
 
       expect(relation.schema.map(&:to_sql_name)).
         to eql([Sequel.qualify(:categories, :id),

data/spec/integration/{association → associations}/one_to_many_spec.rb

@@ -1,10 +1,10 @@
-RSpec.describe ROM::SQL::Association::OneToMany do
-  subject(:assoc) {
-    ROM::SQL::Association::OneToMany.new(:users, :tasks)
-  }
-
+RSpec.describe ROM::SQL::Associations::OneToMany, helpers: true do
   include_context 'users and tasks'
 
+  subject(:assoc) do
+    build_assoc(:one_to_many, :users, :tasks)
+  end
+
   with_adapters do
     before do
       conf.relation(:tasks) do
@@ -17,12 +17,25 @@ RSpec.describe ROM::SQL::Association::OneToMany do
     end
 
     describe '#result' do
-      specify { expect(ROM::SQL::Association::OneToMany.result).to be(:many) }
+      specify { expect(assoc.result).to be(:many) }
+    end
+
+    describe '#combine_keys' do
+      specify { expect(assoc.combine_keys).to eql(id: :user_id) }
+    end
+
+    describe '#associate' do
+      it 'merges FKs into tuples' do
+        child = { name: 'Child' }
+        parent = { id: 312, name: 'Parent '}
+
+        expect(assoc.associate(child, parent)).to eql(user_id: 312, name: 'Child')
+      end
     end
 
     describe '#call' do
       it 'prepares joined relations' do
-        relation = assoc.call(container.relations)
+        relation = assoc.()
 
         expect(relation.schema.map(&:name)).to eql(%i[id user_id title])
 
@@ -41,9 +54,9 @@ RSpec.describe ROM::SQL::Association::OneToMany do
       end
     end
 
-    describe ROM::Plugins::Relation::SQL::AutoCombine, '#for_combine' do
+    describe '#eager_load' do
       it 'preloads relation based on association' do
-        relation = tasks.for_combine(assoc).call(users.call)
+        relation = tasks.eager_load(assoc).call(users.call)
 
         expect(relation.to_a).to eql([
           { id: 1, user_id: 2, title: "Joe's task" },
@@ -55,7 +68,7 @@ RSpec.describe ROM::SQL::Association::OneToMany do
         relation = tasks.
                      join(:task_tags, tag_id: :id).
                      select_append(tasks.task_tags[:tag_id].qualified).
-                     for_combine(assoc).call(users.call)
+                     eager_load(assoc).call(users.call)
 
         expect(relation.to_a).to eql([{ id: 1, user_id: 2, title: "Joe's task", tag_id: 1 }])
       end
@@ -63,7 +76,7 @@ RSpec.describe ROM::SQL::Association::OneToMany do
       it 'respects custom order' do
         relation = tasks.
                      order(tasks[:title].qualified).
-                     for_combine(assoc).call(users.call)
+                     eager_load(assoc).call(users.call)
 
         expect(relation.to_a).
           to eql([{ id: 2, user_id: 1, title: "Jane's task" }, { id: 1, user_id: 2, title: "Joe's task" }])

data/spec/integration/{association → associations}/one_to_one_spec.rb

@@ -1,10 +1,10 @@
-RSpec.describe ROM::SQL::Association::OneToOne do
+RSpec.describe ROM::SQL::Associations::OneToOne, helpers: true do
   include_context 'users'
   include_context 'accounts'
 
-  subject(:assoc) {
-    ROM::SQL::Association::OneToOne.new(:users, :accounts)
-  }
+  subject(:assoc) do
+    build_assoc(:one_to_one, :users, :accounts)
+  end
 
   with_adapters do
     before do
@@ -21,16 +21,20 @@ RSpec.describe ROM::SQL::Association::OneToOne do
     end
 
     describe '#result' do
-      specify { expect(ROM::SQL::Association::OneToOne.result).to be(:one) }
+      specify { expect(assoc.result).to be(:one) }
+    end
+
+    describe '#combine_keys' do
+      specify { expect(assoc.combine_keys).to eql(id: :user_id) }
     end
 
     describe '#call' do
       it 'prepares joined relations' do |example|
-        relation = assoc.call(container.relations)
+        relation = assoc.()
 
         expect(relation.schema.map(&:name)).to eql(%i[id user_id number balance])
 
-        # TODO: this if caluse should be removed when (and if) https://github.com/xerial/sqlite-jdbc/issues/112
+        # TODO: this if clause should be removed when (and if) https://github.com/xerial/sqlite-jdbc/issues/112
         # will be resolved. See https://github.com/rom-rb/rom-sql/issues/49 for details
         if jruby? && sqlite?(example)
           expect(relation.to_a).
@@ -44,9 +48,9 @@ RSpec.describe ROM::SQL::Association::OneToOne do
       end
     end
 
-    describe ROM::Plugins::Relation::SQL::AutoCombine, '#for_combine' do
+    describe '#eager_load' do
       it 'preloads relation based on association' do |example|
-        relation = accounts.for_combine(assoc).call(users.call)
+        relation = accounts.eager_load(assoc).call(users.call)
 
         # TODO: this if caluse should be removed when (and if) https://github.com/xerial/sqlite-jdbc/issues/112
         # will be resolved. See https://github.com/rom-rb/rom-sql/issues/49 for details

data/spec/integration/{association → associations}/one_to_one_through_spec.rb

@@ -1,10 +1,10 @@
-RSpec.describe ROM::SQL::Association::OneToOneThrough do
+RSpec.describe ROM::SQL::Associations::OneToOneThrough, helpers: true do
   include_context 'users'
   include_context 'accounts'
 
-  subject(:assoc) {
-    ROM::SQL::Association::OneToOneThrough.new(:users, :cards, through: :accounts)
-  }
+  subject(:assoc) do
+    build_assoc(:one_to_one_through, :users, :cards, through: :accounts)
+  end
 
   with_adapters do
     before do
@@ -48,12 +48,16 @@ RSpec.describe ROM::SQL::Association::OneToOneThrough do
     end
 
     describe '#result' do
-      specify { expect(ROM::SQL::Association::OneToOneThrough.result).to be(:one) }
+      specify { expect(assoc.result).to be(:one) }
+    end
+
+    describe '#combine_keys' do
+      specify { expect(assoc.combine_keys).to eql(id: :user_id) }
     end
 
     describe '#call' do
       it 'prepares joined relations' do
-        relation = assoc.call(container.relations)
+        relation = assoc.()
 
         expect(relation.schema.map(&:name)).to eql(%i[id account_id pan user_id])
         expect(relation.to_a).to eql([id: 1, account_id: 1, pan: '*6789', user_id: 1])
@@ -62,24 +66,24 @@ RSpec.describe ROM::SQL::Association::OneToOneThrough do
 
     describe ':through another assoc' do
       subject(:assoc) do
-        ROM::SQL::Association::OneToOneThrough.new(:users, :subscriptions, through: :accounts)
+        build_assoc(:one_to_one_through, :users, :subscriptions, through: :accounts)
       end
 
       let(:account_assoc) do
-        ROM::SQL::Association::OneToOneThrough.new(:accounts, :subscriptions, through: :cards)
+        build_assoc(:one_to_one_through, :accounts, :subscriptions, through: :cards)
       end
 
       it 'prepares joined relations through other association' do
-        relation = assoc.call(container.relations)
+        relation = assoc.()
 
         expect(relation.schema.map(&:name)).to eql(%i[id card_id service user_id])
         expect(relation.to_a).to eql([id: 1, card_id: 1, service: 'aws', user_id: 1])
       end
     end
 
-    describe ROM::Plugins::Relation::SQL::AutoCombine, '#for_combine' do
+    describe '#eager_load' do
       it 'preloads relation based on association' do
-        relation = cards.for_combine(assoc).call(users.call)
+        relation = cards.eager_load(assoc).call(users.call)
 
         expect(relation.to_a).to eql([id: 1, account_id: 1, pan: '*6789', user_id: 1])
       end

data/spec/integration/auto_migrations/errors_spec.rb

@@ -0,0 +1,31 @@
+RSpec.describe ROM::SQL::Gateway, :postgres do
+  include_context 'database setup'
+
+  subject(:gateway) { container.gateways[:default] }
+
+  before do
+    conn.drop_table?(:users)
+  end
+
+  describe 'unsupported conversions' do
+    before do
+      conf.relation(:users) do
+        schema do
+          attribute :id,    ROM::SQL::Types::Serial
+          attribute :name,  ROM::SQL::Types::String
+        end
+      end
+    end
+
+    it 'raises an error' do
+      conn.create_table :users do
+        primary_key :id
+        column :name, Integer, null: false
+      end
+
+      expect {
+        gateway.auto_migrate!(conf)
+      }.to raise_error(ROM::SQL::UnsupportedConversion, /Don't know how to convert/)
+    end
+  end
+end