rom-sql 1.0.1 → 1.0.2

data/spec/integration/association/many_to_one/from_view_spec.rb

@@ -1,11 +1,15 @@
 require 'spec_helper'
 
 RSpec.describe ROM::SQL::Association::ManyToOne, '#call' do
+  include_context 'database setup'
+
+  before do
+    inferrable_relations.concat %i(destinations flights)
+  end
+
   let(:assoc_inter) { relations[:flights].associations[:inter_destination] }
   let(:assoc_final) { relations[:flights].associations[:final_destination] }
 
-  include_context 'database setup'
-
   with_adapters do
     before do
       conn.create_table(:destinations) do
@@ -59,7 +63,7 @@ RSpec.describe ROM::SQL::Association::ManyToOne, '#call' do
       expect(relation.schema.map(&:to_sym)).
         to eql(%i(destinations__id destinations__name destinations__intermediate flights__id___flight_id))
 
-      expect(relation.first).to eql(id: 2, intermediate: true, name: 'Intermediate', flight_id: 1)
+      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)
@@ -67,7 +71,7 @@ RSpec.describe ROM::SQL::Association::ManyToOne, '#call' do
       expect(relation.schema.map(&:to_sym)).
         to eql(%i(destinations__id destinations__name destinations__intermediate flights__id___flight_id))
 
-      expect(relation.first).to eql(id: 1, intermediate: false, name: 'Final', flight_id: 2)
+      expect(relation.first).to eql(id: 1, intermediate: db_false, name: 'Final', flight_id: 2)
       expect(relation.count).to be(1)
     end
   end

data/spec/integration/association/many_to_one_spec.rb

@@ -1,86 +1,93 @@
 RSpec.describe ROM::SQL::Association::ManyToOne, helpers: true do
-  subject(:assoc) {
-    ROM::SQL::Association::ManyToOne.new(:tasks, :users)
-  }
-
-  include_context 'users and tasks'
-
   let(:users) { container.relations[:users] }
   let(:tasks) { container.relations[:tasks] }
-  let(:articles) { container.relations[:articles] }
 
   with_adapters do
-    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
+    context 'common name conventions' do
+      include_context 'users and tasks'
+      include_context 'accounts'
+
+      subject(:assoc) {
+        ROM::SQL::Association::ManyToOne.new(:tasks, :users)
+      }
+
+      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
         end
       end
-    end
 
-    describe '#result' do
-      specify { expect(ROM::SQL::Association::ManyToOne.result).to be(:one) }
-    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)
+      describe '#name' do
+        it 'uses target by default' do
+          expect(assoc.name).to be(:users)
+        end
       end
-    end
 
-    describe '#target' do
-      it 'builds full relation name' do
-        assoc = ROM::SQL::Association::ManyToOne.new(:users, :tasks, relation: :foo)
+      describe '#target' do
+        it 'builds full relation name' do
+          assoc = ROM::SQL::Association::ManyToOne.new(:users, :tasks, relation: :foo)
 
-        expect(assoc.name).to be(:tasks)
-        expect(assoc.target).to eql(ROM::SQL::Association::Name[:foo, :tasks])
+          expect(assoc.name).to be(:tasks)
+          expect(assoc.target).to eql(ROM::SQL::Association::Name[:foo, :tasks])
+        end
       end
-    end
 
-    describe '#call' do
-      it 'prepares joined relations' do
-        relation = assoc.call(container.relations)
+      describe '#call' do
+        it 'prepares joined relations' do
+          relation = assoc.call(container.relations)
 
-        expect(relation.schema.map(&:to_sym))
-          .to eql(%i[users__id users__name tasks__id___task_id])
+          expect(relation.schema.map(&:to_sym))
+            .to eql(%i[users__id users__name tasks__id___task_id])
 
-        expect(relation.where(user_id: 1).one).to eql(id: 1, task_id: 2, name: 'Jane')
+          expect(relation.where(user_id: 1).one).to eql(id: 1, task_id: 2, name: 'Jane')
 
-        expect(relation.where(user_id: 2).one).to eql(id: 2, task_id: 1, name: 'Joe')
+          expect(relation.where(user_id: 2).one).to eql(id: 2, task_id: 1, name: 'Joe')
 
-        expect(relation.to_a).to eql([
-          { id: 2, task_id: 1, name: 'Joe' },
-          { id: 1, task_id: 2, name: 'Jane' }
-        ])
+          expect(relation.to_a).
+            to eql([{ id: 2, task_id: 1, name: 'Joe' },
+                    { id: 1, task_id: 2, name: 'Jane' }])
+        end
       end
-    end
 
-    describe ROM::Plugins::Relation::SQL::AutoCombine, '#for_combine' do
-      it 'preloads relation based on association' do
-        relation = users.for_combine(assoc).call(tasks.call)
+      describe ROM::Plugins::Relation::SQL::AutoCombine, '#for_combine' do
+        it 'preloads relation based on association' do
+          relation = users.for_combine(assoc).call(tasks.call)
 
-        expect(relation.to_a).to eql([
-          { id: 2, task_id: 1, name: 'Joe' },
-          { id: 1, task_id: 2, name: 'Jane' }
-        ])
-      end
+          expect(relation.to_a).
+            to eql([{ id: 2, task_id: 1, name: 'Joe' },
+                    { id: 1, task_id: 2, name: 'Jane' }])
+        end
 
-      it 'maintains original relation' do
-        users.accounts.insert(user_id: 2, number: 'a1', balance: 0)
+        it 'maintains original relation' do
+          users.accounts.insert(user_id: 2, number: 'a1', balance: 0)
 
-        relation = users.
-                     join(:accounts, user_id: :id).
-                     select_append(users.accounts[:number].as(:account_num)).
-                     for_combine(assoc).call(tasks.call)
+          relation = users.
+                       join(:accounts, user_id: :id).
+                       select_append(users.accounts[:number].as(:account_num)).
+                       order(:account_num).
+                       for_combine(assoc).call(tasks.call)
 
-        expect(relation.to_a).to eql([{ id: 2, task_id: 1, name: 'Joe', account_num: 'a1' }])
+          expect(relation.to_a).
+            to eql([{ id: 2, task_id: 1, name: 'Joe', account_num: 'a1' },
+                    { id: 1, task_id: 2, name: 'Jane', account_num: '42' }])
+        end
       end
     end
 
     context 'arbitrary name conventions' do
+      include_context 'users'
+      include_context 'posts'
+
       let(:articles_name) { ROM::Relation::Name[:articles, :posts] }
+      let(:articles) { container.relations[:articles] }
 
       subject(:assoc) do
         ROM::SQL::Association::ManyToOne.new(articles_name, :users)

data/spec/integration/association/one_to_many/custom_fks_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
 
 RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
+  include_context 'users'
+
+  before do
+    inferrable_relations.concat %i(puzzles)
+  end
+
   subject(:assoc) do
     relations[:users].associations[:solved_puzzles]
   end
 
-  include_context 'database setup'
-
   with_adapters do
     before do
       conn.create_table(:puzzles) do
@@ -25,9 +29,6 @@ RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
         end
       end
 
-      joe_id = relations[:users].insert(name: 'Joe')
-      jane_id = relations[:users].insert(name: 'Jane')
-
       relations[:puzzles].insert(author_id: joe_id, text: 'P1')
       relations[:puzzles].insert(author_id: joe_id, solver_id: jane_id, text: 'P2')
     end
@@ -42,7 +43,7 @@ RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
       expect(relation.schema.map(&:to_sym)).
         to eql(%i[puzzles__id puzzles__author_id puzzles__solver_id puzzles__text])
 
-      expect(relation.first).to eql(id: 2, author_id: 1, solver_id: 2, text: 'P2')
+      expect(relation.first).to eql(id: 2, author_id: 2, solver_id: 1, text: 'P2')
     end
   end
 end

data/spec/integration/association/one_to_many/from_view_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
 
 RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
+  include_context 'users'
+
+  before do
+    inferrable_relations.concat %i(puzzles)
+  end
+
   subject(:assoc) do
     relations[:users].associations[:solved_puzzles]
   end
 
-  include_context 'database setup'
-
   with_adapters do
     before do
       conn.create_table(:puzzles) do
@@ -33,17 +37,10 @@ RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
         end
       end
 
-      joe_id = relations[:users].insert(name: 'Joe')
-      jane_id = relations[:users].insert(name: 'Jane')
-
       relations[:puzzles].insert(user_id: joe_id, text: 'P1')
       relations[:puzzles].insert(user_id: joe_id, solved: true, text: 'P2')
     end
 
-    after do
-      conn.drop_table(:puzzles)
-    end
-
     it 'prepares joined relations using custom view' do
       relation = assoc.call(relations)
 
@@ -51,7 +48,7 @@ RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
         to eql(%i[puzzles__id puzzles__user_id puzzles__text puzzles__solved])
 
       expect(relation.count).to be(1)
-      expect(relation.first).to eql(id: 2, user_id: 1, solved: true, text: 'P2')
+      expect(relation.first).to eql(id: 2, user_id: 2, solved: db_true, text: 'P2')
     end
   end
 end

data/spec/integration/association/one_to_many/self_ref_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
 
 RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
+  include_context 'database setup'
+
+  before do
+    inferrable_relations.concat %i(categories)
+  end
+
   subject(:assoc) do
     relations[:categories].associations[:children]
   end
 
-  include_context 'database setup'
-
   with_adapters do
     before do
       conn.create_table(:categories) do
@@ -31,10 +35,6 @@ RSpec.describe ROM::SQL::Association::OneToMany, '#call' do
       c3_id = relations[:categories].insert(name: 'C5', parent_id: p1_id)
     end
 
-    after do
-      conn.drop_table(:categories)
-    end
-
     it 'prepares joined relations using custom FK for a self-ref association' do
       relation = assoc.call(relations)
 

data/spec/integration/association/one_to_many_spec.rb

@@ -5,9 +5,6 @@ RSpec.describe ROM::SQL::Association::OneToMany do
 
   include_context 'users and tasks'
 
-  let(:users) { container.relations[:users] }
-  let(:tasks) { container.relations[:tasks] }
-
   with_adapters do
     before do
       conf.relation(:tasks) do

data/spec/integration/association/one_to_one_spec.rb

@@ -1,15 +1,15 @@
 RSpec.describe ROM::SQL::Association::OneToOne do
+  include_context 'users'
+  include_context 'accounts'
+
   subject(:assoc) {
     ROM::SQL::Association::OneToOne.new(:users, :accounts)
   }
 
-  include_context 'users and accounts'
-
-  let(:users) { container.relations[:users] }
-  let(:accounts) { container.relations[:accounts] }
-
   with_adapters do
     before do
+      conn[:accounts].insert user_id: 1, number: '43', balance: -273.15.to_d
+
       conf.relation(:accounts) do
         schema do
           attribute :id, ROM::SQL::Types::Serial
@@ -33,10 +33,13 @@ RSpec.describe ROM::SQL::Association::OneToOne do
         # 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
         if jruby? && sqlite?(example)
-          expect(relation.to_a).to eql([id: 1, user_id: 1, number: '42', balance: 10_000])
+          expect(relation.to_a).
+            to eql([{ id: 1, user_id: 1, number: '42', balance: 10_000 },
+                    { id: 2, user_id: 1, number: '43', balance: -273.15 }])
         else
-          pending 'find out why mysql returns integer here' if !jruby? && mysql?(example)
-          expect(relation.to_a).to eql([id: 1, user_id: 1, number: '42', balance: 10_000.to_d])
+          expect(relation.to_a).
+            to eql([{ id: 1, user_id: 1, number: '42', balance: 10_000.to_d },
+                    { id: 2, user_id: 1, number: '43', balance: -273.15.to_d }])
         end
       end
     end
@@ -48,10 +51,13 @@ RSpec.describe ROM::SQL::Association::OneToOne do
         # 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
         if jruby? && sqlite?(example)
-          expect(relation.to_a).to eql([id: 1, user_id: 1, number: '42', balance: 10_000])
+          expect(relation.to_a).
+            to eql([{ id: 1, user_id: 1, number: '42', balance: 10_000 },
+                    { id: 2, user_id: 1, number: '43', balance: -273.15 }])
         else
-          pending 'find out why mysql returns integer here' if !jruby? && mysql?(example)
-          expect(relation.to_a).to eql([id: 1, user_id: 1, number: '42', balance: 10_000.to_d])
+          expect(relation.to_a).
+            to eql([{ id: 1, user_id: 1, number: '42', balance: 10_000.to_d },
+                    { id: 2, user_id: 1, number: '43', balance: -273.15.to_d }])
         end
       end
     end

data/spec/integration/association/one_to_one_through_spec.rb

@@ -1,13 +1,11 @@
 RSpec.describe ROM::SQL::Association::OneToOneThrough do
+  include_context 'users'
+  include_context 'accounts'
+
   subject(:assoc) {
     ROM::SQL::Association::OneToOneThrough.new(:users, :cards, through: :accounts)
   }
 
-  include_context 'users and accounts'
-
-  let(:users) { container.relations[:users] }
-  let(:cards) { container.relations[:cards] }
-
   with_adapters do
     before do
       conf.relation(:accounts) do

data/spec/integration/commands/create_spec.rb

@@ -1,6 +1,6 @@
 require 'dry-struct'
 
-RSpec.describe 'Commands / Create', :postgres do
+RSpec.describe 'Commands / Create', :postgres, seeds: false do
   include_context 'relations'
 
   let(:users) { commands[:users] }
@@ -19,10 +19,6 @@ RSpec.describe 'Commands / Create', :postgres do
 
     conn.add_index :users, :name, unique: true
 
-    conf.relation(:puppies) do
-      schema(infer: true)
-    end
-
     conf.commands(:users) do
       define(:create) do
         input Test::Params
@@ -38,10 +34,6 @@ RSpec.describe 'Commands / Create', :postgres do
     conf.commands(:tasks) do
       define(:create)
     end
-
-    conf.commands(:puppies) do
-      define(:create)
-    end
   end
 
   with_adapters do
@@ -51,7 +43,7 @@ RSpec.describe 'Commands / Create', :postgres do
           users.create.call(name: 'Jane')
         }
 
-        expect(result.value).to eq(id: 1, name: 'Jane')
+        expect(result.value).to eql(id: 1, name: 'Jane')
       end
 
       it 'creates multiple records if nothing was raised' do
@@ -71,7 +63,7 @@ RSpec.describe 'Commands / Create', :postgres do
           }
         }
 
-        expect(result.value).to eq(id: 1, name: 'Jane')
+        expect(result.value).to eql(id: 1, name: 'Jane')
       end
 
       it 'creates nothing if command error was raised' do
@@ -182,12 +174,30 @@ RSpec.describe 'Commands / Create', :postgres do
       }.to raise_error(ROM::SQL::NotNullConstraintError)
     end
 
-    it 're-raises not-null constraint violation error with nil boolean' do
-      puppies = commands[:puppies]
+    # Because Oracle doesn't have boolean in SQL
+    if !metadata[:oracle]
+      context 'with puppies' do
+        include_context 'puppies'
 
-      expect {
-        puppies.try { puppies.create.call(name: 'Charlie', cute: nil) }
-      }.to raise_error(ROM::SQL::NotNullConstraintError)
+        before do
+          conf.relation(:puppies) do
+            schema(infer: true)
+          end
+
+
+          conf.commands(:puppies) do
+            define(:create)
+          end
+        end
+
+        it 're-raises not-null constraint violation error with nil boolean' do
+          puppies = commands[:puppies]
+
+          expect {
+            puppies.try { puppies.create.call(name: 'Charlie', cute: nil) }
+          }.to raise_error(ROM::SQL::NotNullConstraintError)
+        end
+      end
     end
 
     it 're-raises uniqueness constraint violation error' do
@@ -239,7 +249,11 @@ RSpec.describe 'Commands / Create', :postgres do
 
       context 'with a composite pk' do
         before do
-          conn.create_table?(:user_group) do
+          inferrable_relations.concat %i(user_group)
+        end
+
+        before do
+          conn.create_table(:user_group) do
             primary_key [:user_id, :group_id]
             column :user_id, Integer, null: false
             column :group_id, Integer, null: false
@@ -254,16 +268,13 @@ RSpec.describe 'Commands / Create', :postgres do
           end
         end
 
-        after do
-          conn.drop_table(:user_group)
-        end
-
         # with a composite pk sequel returns 0 when inserting for MySQL
         if !metadata[:mysql]
-          it 'materializes the result' do
+          it 'materializes the result' do |ex|
             command = container.commands[:user_group][:create]
             result = command.call(user_id: 1, group_id: 2)
 
+            pending "if sequel could use Oracle's RETURNING statement, that would be possible" if oracle?(ex)
             expect(result).to eql(user_id: 1, group_id: 2)
           end
         end