rom-sql 0.8.0 → 0.9.0

data/spec/integration/association/many_to_many_spec.rb

@@ -1,7 +1,8 @@
 RSpec.describe ROM::SQL::Association::ManyToMany do
   include_context 'users and tasks'
 
-  with_adapters :sqlite do
+  # FIXME: Figure out what is wrong with sqlite
+  with_adapters(:postgres, :mysql) do
     context 'with two associations pointing to the same target relation' do
       let(:container) do
         ROM.container(:sql, uri) do |conf|

data/spec/integration/association/one_to_one_spec.rb

@@ -25,30 +25,32 @@ RSpec.describe ROM::SQL::Association::OneToOne do
     end
 
     describe '#call' do
-      it 'prepares joined relations' do
+      it 'prepares joined relations' do |example|
         relation = assoc.call(container.relations)
 
         expect(relation.attributes).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
         # will be resolved. See https://github.com/rom-rb/rom-sql/issues/49 for details
-        if defined? JRUBY_VERSION && SQLITE_DB_URI == db_uri
+        if jruby? && sqlite?(example)
           expect(relation.to_a).to eql([id: 1, user_id: 1, number: '42', balance: 10_000])
         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])
         end
       end
     end
 
     describe ROM::Plugins::Relation::SQL::AutoCombine, '#for_combine' do
-      it 'preloads relation based on association' do
+      it 'preloads relation based on association' do |example|
         relation = accounts.for_combine(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
-        if defined? JRUBY_VERSION && SQLITE_DB_URI == db_uri
+        if jruby? && sqlite?(example)
           expect(relation.to_a).to eql([id: 1, user_id: 1, number: '42', balance: 10_000])
         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])
         end
       end

data/spec/integration/combine_spec.rb

@@ -1,4 +1,4 @@
-describe 'Eager loading', adapters: :all do
+RSpec.describe 'Eager loading' do
   include_context 'users and tasks'
 
   with_adapters do

data/spec/integration/commands/create_spec.rb

@@ -1,27 +1,31 @@
-require 'virtus'
+require 'dry-struct'
 
-RSpec.describe 'Commands / Create' do
+RSpec.describe 'Commands / Create', :postgres do
   include_context 'relations'
 
   let(:users) { commands[:users] }
   let(:tasks) { commands[:tasks] }
 
   before do
-    class Params
-      include Virtus.model
+    module Test
+      class Params < Dry::Struct
+        attribute :name, Types::Strict::String.optional
 
-      attribute :name
-
-      def self.[](input)
-        new(input)
+        def self.[](input)
+          new(input)
+        end
       end
     end
 
     conn.add_index :users, :name, unique: true
 
+    conf.relation(:puppies) do
+      schema(infer: true)
+    end
+
     conf.commands(:users) do
       define(:create) do
-        input Params
+        input Test::Params
 
         validator -> tuple {
           raise ROM::CommandError, 'name cannot be empty' if tuple[:name] == ''
@@ -38,6 +42,10 @@ RSpec.describe 'Commands / Create' do
     conf.commands(:tasks) do
       define(:create)
     end
+
+    conf.commands(:puppies) do
+      define(:create)
+    end
   end
 
   with_adapters do
@@ -183,6 +191,14 @@ RSpec.describe 'Commands / Create' do
       }.to raise_error(ROM::SQL::NotNullConstraintError)
     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
+
     it 're-raises uniqueness constraint violation error' do
       expect {
         users.try {
@@ -198,19 +214,19 @@ RSpec.describe 'Commands / Create' do
         tasks.try {
           tasks.create.call(user_id: 918_273_645)
         }
-      }.to raise_error(ROM::SQL::ForeignKeyConstraintError, /user_id/)
+      }.to raise_error(ROM::SQL::ForeignKeyConstraintError)
     end
 
     it 're-raises database errors' do
       expect {
-        Params.attribute :bogus_field
+        Test::Params.attribute :bogus_field, Types::Int
         users.try { users.create.call(name: 'some name', bogus_field: 23) }
       }.to raise_error(ROM::SQL::DatabaseError)
     end
 
     it 'supports [] syntax instead of call' do
       expect {
-        Params.attribute :bogus_field
+        Test::Params.attribute :bogus_field, Types::Int
         users.try { users.create[name: 'some name', bogus_field: 23] }
       }.to raise_error(ROM::SQL::DatabaseError)
     end
@@ -259,29 +275,38 @@ RSpec.describe 'Commands / Create' do
           conn.drop_table(:user_group)
         end
 
-        it 'materializes the result' do
-          pending 'TODO: with a composite pk sequel returns 0 when inserting' if mysql?
+        # with a composite pk sequel returns 0 when inserting for MySQL
+        if !metadata[:mysql]
+          it 'materializes the result' do
+            command = container.commands[:user_group][:create]
+            result = command.call(user_id: 1, group_id: 2)
 
-          command = container.commands[:user_group][:create]
-          result = command.call(user_id: 1, group_id: 2)
-
-          expect(result).to eql(user_id: 1, group_id: 2)
+            expect(result).to eql(user_id: 1, group_id: 2)
+          end
         end
       end
     end
   end
 
-  describe '#call', adapter: :postgres do
-    it 're-raises check constraint violation error', adapter: :postgres do
+  describe '#call' do
+    it 're-raises check constraint violation error' do
       expect {
         users.try {
           users.create.call(name: 'J')
         }
       }.to raise_error(ROM::SQL::CheckConstraintError, /name/)
     end
+
+    it 're-raises constraint violation error' do
+      expect {
+        users.try {
+          tasks.create.call(title: '')
+        }
+      }.to raise_error(ROM::SQL::ConstraintError, /title/)
+    end
   end
 
-  describe '#upsert', adapter: :postgres do
+  describe '#upsert' do
     let(:task) { { title: 'task 1' } }
 
     before { tasks.create.call(task) }

data/spec/integration/commands/delete_spec.rb

@@ -61,47 +61,22 @@ RSpec.describe 'Commands / Delete' do
     end
 
     describe '#execute' do
-      context 'with postgres adapter' do
-        context 'with a single record' do
-          it 'materializes the result' do
-            result = container.command(:users).delete.by_name(%w(Jade)).execute
-            expect(result).to eq([
-              { id: 3, name: 'Jade' }
-            ])
-          end
-        end
-
-        context 'with multiple records' do
-          it 'materializes the results' do
-            result = container.command(:users).delete.by_name(%w(Jade John)).execute
-            expect(result).to eq([
-              { id: 3, name: 'Jade' },
-              { id: 4, name: 'John' }
-            ])
-          end
+      context 'with a single record' do
+        it 'materializes the result' do
+          result = container.command(:users).delete.by_name(%w(Jade)).execute
+          expect(result).to eq([
+            { id: 3, name: 'Jade' }
+          ])
         end
       end
 
-      context 'with other adapter', adapter: :sqlite do
-        let(:uri) { SQLITE_DB_URI }
-
-        context 'with a single record' do
-          it 'materializes the result' do
-            result = container.command(:users).delete.by_name(%w(Jade)).execute
-            expect(result).to eq([
-              { id: 3, name: 'Jade' }
-            ])
-          end
-        end
-
-        context 'with multiple records' do
-          it 'materializes the results' do
-            result = container.command(:users).delete.by_name(%w(Jade John)).execute
-            expect(result).to eq([
-              { id: 3, name: 'Jade' },
-              { id: 4, name: 'John' }
-            ])
-          end
+      context 'with multiple records' do
+        it 'materializes the results' do
+          result = container.command(:users).delete.by_name(%w(Jade John)).execute
+          expect(result).to eq([
+            { id: 3, name: 'Jade' },
+            { id: 4, name: 'John' }
+          ])
         end
       end
     end

data/spec/integration/commands/update_spec.rb

@@ -1,4 +1,4 @@
-require 'anima'
+require 'dry-struct'
 
 RSpec.describe 'Commands / Update' do
   include_context 'database setup'
@@ -37,6 +37,11 @@ RSpec.describe 'Commands / Update' do
 
     context 'without a schema' do
       before do
+        Test::User = Class.new(Dry::Struct) {
+          attribute :id, Types::Strict::Int
+          attribute :name, Types::Strict::String
+        }
+
         conf.relation(:users) do
           def by_id(id)
             where(id: id).limit(1)
@@ -51,8 +56,6 @@ RSpec.describe 'Commands / Update' do
           define(:update)
         end
 
-        Test::User = Class.new { include Anima.new(:id, :name) }
-
         conf.mappers do
           register :users, entity: -> tuples { tuples.map { |tuple| Test::User.new(tuple) } }
         end
@@ -122,47 +125,22 @@ RSpec.describe 'Commands / Update' do
         end
 
         describe '#execute' do
-          context 'with postgres adapter' do
-            context 'with a single record' do
-              it 'materializes the result' do
-                result = users.update.by_name('Piotr').execute(name: 'Pete')
-                expect(result).to eq([
-                  { id: 1, name: 'Pete' }
-                ])
-              end
-            end
-
-            context 'with multiple records' do
-              it 'materializes the results' do
-                result = users.update.by_name(%w(Piotr Jane)).execute(name: 'Josie')
-                expect(result).to eq([
-                  { id: 1, name: 'Josie' },
-                  { id: 2, name: 'Josie' }
-                ])
-              end
+          context 'with a single record' do
+            it 'materializes the result' do
+              result = users.update.by_name('Piotr').execute(name: 'Pete')
+              expect(result).to eq([
+                { id: 1, name: 'Pete' }
+              ])
             end
           end
 
-          context 'with other adapter', adapter: :sqlite do
-            let(:uri) { SQLITE_DB_URI }
-
-            context 'with a single record' do
-              it 'materializes the result' do
-                result = users.update.by_name('Piotr').execute(name: 'Pete')
-                expect(result).to eq([
-                  { id: 1, name: 'Pete' }
-                ])
-              end
-            end
-
-            context 'with multiple records' do
-              it 'materializes the results' do
-                result = users.update.by_name(%w(Piotr Jane)).execute(name: 'Josie')
-                expect(result).to eq([
-                  { id: 1, name: 'Josie' },
-                  { id: 2, name: 'Josie' }
-                ])
-              end
+          context 'with multiple records' do
+            it 'materializes the results' do
+              result = users.update.by_name(%w(Piotr Jane)).execute(name: 'Josie')
+              expect(result).to eq([
+                { id: 1, name: 'Josie' },
+                { id: 2, name: 'Josie' }
+              ])
             end
           end
         end

data/spec/integration/commands/upsert_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe 'Commands / Postgres / Upsert', adapter: :postgres do
+RSpec.describe 'Commands / Postgres / Upsert', :postgres do
   subject(:command) { commands[:tasks][:create_or_update] }
 
   include_context 'relations'

data/spec/integration/gateway_spec.rb

@@ -1,12 +1,12 @@
-describe ROM::SQL::Gateway do
-  describe 'migration' do
-    let(:conn) { Sequel.connect(POSTGRES_DB_URI) }
+RSpec.describe ROM::SQL::Gateway, :postgres, skip_tables: true do
+  include_context 'database setup'
 
+  describe 'migration' do
     context 'creating migrations inline' do
       subject(:gateway) { container.gateways[:default] }
 
       let(:conf) { ROM::Configuration.new(:sql, conn) }
-      let!(:container) { ROM.container(conf) }
+      let(:container) { ROM.container(conf) }
 
       after do
         [:rabbits, :carrots].each do |name|
@@ -39,15 +39,13 @@ describe ROM::SQL::Gateway do
     end
 
     context 'running migrations from a file system' do
-      include_context 'database setup'
-
       let(:migration_dir) do
         Pathname(__FILE__).dirname.join('../fixtures/migrations').realpath
       end
 
       let(:migrator) { ROM::SQL::Migration::Migrator.new(conn, path: migration_dir) }
       let(:conf) { ROM::Configuration.new(:sql, [conn, migrator: migrator]) }
-      let!(:container) { ROM.container(conf) }
+      let(:container) { ROM.container(conf) }
 
       it 'returns true for pending migrations' do
         expect(container.gateways[:default].pending_migrations?).to be_truthy
@@ -65,8 +63,6 @@ describe ROM::SQL::Gateway do
   end
 
   context 'setting up' do
-    include_context 'database setup'
-
     it 'skips settings up associations when tables are missing' do
       conf = ROM::Configuration.new(:sql, uri) do |config|
         config.relation(:foos) do

data/spec/integration/migration_spec.rb

@@ -1,13 +1,12 @@
-RSpec.describe ROM::SQL, '.migration' do
-  let(:connection) { ROM::SQL.gateway.connection }
-  let(:conf) { ROM::Configuration.new(:sql, POSTGRES_DB_URI) }
+RSpec.describe ROM::SQL, '.migration', :postgres, skip_tables: true do
+  include_context 'database setup'
 
   before do
     conf
-    connection.drop_table?(:dragons)
+    conn.drop_table?(:dragons)
   end
 
-  xit 'creates a migration for a specific gateway' do
+  it 'creates a migration for a specific gateway' do
     migration = ROM::SQL.migration do
       change do
         create_table :dragons do
@@ -17,8 +16,8 @@ RSpec.describe ROM::SQL, '.migration' do
       end
     end
 
-    migration.apply(connection, :up)
+    migration.apply(conn, :up)
 
-    expect(connection.table_exists?(:dragons)).to be(true)
+    expect(conn.table_exists?(:dragons)).to be(true)
   end
 end

data/spec/integration/read_spec.rb

@@ -1,37 +1,26 @@
-require 'virtus'
+require 'dry-struct'
 
-RSpec.describe 'Reading relations' do
+RSpec.describe 'Reading relations using custom mappers' do
   include_context 'users and tasks'
 
-  # FIXME: one example fails on :mysql
-  with_adapters(:postgres, :sqlite) do
+  with_adapters do
     before :each do
-      class Goal
-        include Virtus.value_object(coerce: true)
-
-        values do
-          attribute :id, Integer
-          attribute :title, String
+      module Test
+        class Goal < Dry::Struct
+          attribute :id, Types::Strict::Int
+          attribute :title, Types::Strict::String
         end
-      end
-
-      class User
-        include Virtus.value_object(coerce: true)
 
-        values do
-          attribute :id, Integer
-          attribute :name, String
-          attribute :goals, Array[Goal]
+        class User < Dry::Struct
+          attribute :id, Types::Strict::Int
+          attribute :name, Types::Strict::String
+          attribute :goals, Types::Strict::Array.member(Goal)
         end
-      end
-
-      class UserGoalCount
-        include Virtus.value_object(coerce: true)
 
-        values do
-          attribute :id, Integer
-          attribute :name, String
-          attribute :goal_count, Integer
+        class UserGoalCount < Dry::Struct
+          attribute :id, Types::Strict::Int
+          attribute :name, Types::Strict::String
+          attribute :goal_count, Types::Strict::Int
         end
       end
 
@@ -80,10 +69,10 @@ RSpec.describe 'Reading relations' do
 
       conf.mappers do
         define(:users) do
-          model User
+          model Test::User
 
           group :goals do
-            model Goal
+            model Test::Goal
 
             attribute :id, from: :tasks_id
             attribute :title
@@ -91,7 +80,7 @@ RSpec.describe 'Reading relations' do
         end
 
         define(:user_goal_counts) do
-          model UserGoalCount
+          model Test::UserGoalCount
         end
       end
     end
@@ -100,20 +89,23 @@ RSpec.describe 'Reading relations' do
       user = container.relation(:users).as(:users).with_goals.by_name('Jane').to_a.first
 
       expect(user).to eql(
-        User.new(
-          id: 1, name: 'Jane', goals: [Goal.new(id: 2, title: "Jane's task")]
+        Test::User.new(
+          id: 1, name: 'Jane', goals: [Test::Goal.new(id: 2, title: "Jane's task")]
         ))
     end
 
-    it 'works with grouping and aggregates' do
-      container.relations[:goals].insert(id: 3, user_id: 1, title: 'Get Milk')
+    # FIXME: on mysql and sqlite
+    if metadata[:postgres]
+      it 'works with grouping and aggregates' do
+        container.relations[:goals].insert(id: 3, user_id: 1, title: 'Get Milk')
 
-      users_with_goal_count = container.relation(:user_goal_counts).as(:user_goal_counts).all
+        users_with_goal_count = container.relation(:user_goal_counts).as(:user_goal_counts).all
 
-      expect(users_with_goal_count.to_a).to eq([
-        UserGoalCount.new(id: 1, name: "Jane", goal_count: 2),
-        UserGoalCount.new(id: 2, name: "Joe", goal_count: 1)
-      ])
+        expect(users_with_goal_count.to_a).to eq([
+          Test::UserGoalCount.new(id: 1, name: "Jane", goal_count: 2),
+          Test::UserGoalCount.new(id: 2, name: "Joe", goal_count: 1)
+        ])
+      end
     end
   end
 end