rom-sql 2.0.0.beta1 → 2.0.0.beta2

data/spec/integration/commands/delete_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe 'Commands / Delete' do
     describe '#transaction' do
       it 'deletes in normal way if no error raised' do
         expect {
-          delete_user.transaction do
+          users.transaction do
             delete_user.by_name('Jade').call
           end
         }.to change { users.count }.by(-1)
@@ -32,9 +32,9 @@ RSpec.describe 'Commands / Delete' do
 
       it 'deletes nothing if error was raised' do
         expect {
-          delete_user.transaction do
+          users.transaction do |t|
             delete_user.by_name('Jade').call
-            raise ROM::SQL::Rollback
+            t.rollback!
           end
         }.to_not change { users.count }
       end
@@ -42,9 +42,9 @@ RSpec.describe 'Commands / Delete' do
 
     describe '#call' do
       it 'deletes all tuples in a restricted relation' do
-        result = user_commands.try { delete_user.by_name('Jade').call }
+        result = delete_user.by_name('Jade').call
 
-        expect(result.value).to eql(id: 3, name: 'Jade')
+        expect(result).to eql(id: 3, name: 'Jade')
       end
 
       it 're-raises database error' do
@@ -55,7 +55,7 @@ RSpec.describe 'Commands / Delete' do
         )
 
         expect {
-          user_commands.try { command.call }
+          command.call
         }.to raise_error(ROM::SQL::DatabaseError, /totally wrong/)
       end
     end

data/spec/integration/commands/update_spec.rb

@@ -41,17 +41,17 @@ RSpec.describe 'Commands / Update', seeds: false do
 
     context '#transaction' do
       it 'update record if there was no errors' do
-        result = update_user.transaction do
+        result = users.transaction do
           update_user.by_id(piotr[:id]).call(peter)
         end
 
-        expect(result.value).to eq([{ id: 1, name: 'Peter' }])
+        expect(result).to eq([{ id: 1, name: 'Peter' }])
       end
 
       it 'updates nothing if error was raised' do
-        update_user.transaction do
+        users.transaction do |t|
           update_user.by_id(piotr[:id]).call(peter)
-          raise ROM::SQL::Rollback
+          t.rollback!
         end
 
         expect(users.first[:name]).to eql('Piotr')
@@ -60,11 +60,9 @@ RSpec.describe 'Commands / Update', seeds: false do
 
     describe '#call' do
       it 'updates relation tuples' do
-        result = user_commands.try do
-          update_user.by_id(piotr[:id]).call(peter)
-        end
+        result = update_user.by_id(piotr[:id]).call(peter)
 
-        expect(result.value.to_a).to match_array([{ id: 1, name: 'Peter' }])
+        expect(result.to_a).to match_array([{ id: 1, name: 'Peter' }])
       end
 
       it 're-raises database errors' do |example|

data/spec/integration/plugins/associates/many_to_many_spec.rb

@@ -53,8 +53,8 @@ RSpec.describe 'Plugins / :associates / with many-to-many', :sqlite, seeds: fals
   end
 
   it 'associates a child with many parents' do
-    add_tags = create_tag.with([{ name: 'red' }, { name: 'blue' }])
-    add_task = create_task.with(user_id: jane[:id], title: "Jade's task")
+    add_tags = create_tag.curry([{ name: 'red' }, { name: 'blue' }])
+    add_task = create_task.curry(user_id: jane[:id], title: "Jade's task")
 
     command = add_tags >> add_task
 

data/spec/integration/plugins/associates_spec.rb

@@ -68,8 +68,8 @@ RSpec.describe 'Plugins / :associates', seeds: false do
 
       shared_context 'automatic FK setting' do
         it 'sets foreign key prior execution for many tuples' do
-          create_user = users[:create].with(name: 'Jade')
-          create_task = tasks[:create_many].with([{ title: 'Task one' }, { title: 'Task two' }])
+          create_user = users[:create].curry(name: 'Jade')
+          create_task = tasks[:create_many].curry([{ title: 'Task one' }, { title: 'Task two' }])
 
           command = create_user >> create_task
 
@@ -82,8 +82,8 @@ RSpec.describe 'Plugins / :associates', seeds: false do
         end
 
         it 'sets foreign key prior execution for one tuple' do
-          create_user = users[:create].with(name: 'Jade')
-          create_task = tasks[:create_one].with(title: 'Task one')
+          create_user = users[:create].curry(name: 'Jade')
+          create_task = tasks[:create_one].curry(title: 'Task one')
 
           command = create_user >> create_task
 
@@ -161,9 +161,9 @@ RSpec.describe 'Plugins / :associates', seeds: false do
           end
 
           it 'sets FKs for the join table' do
-            create_user = users[:create].with(name: 'Jade')
-            create_task = tasks[:create].with(title: "Jade's task")
-            create_tags = tags[:create].with([{ name: 'red' }, { name: 'blue' }])
+            create_user = users[:create].curry(name: 'Jade')
+            create_task = tasks[:create].curry(title: "Jade's task")
+            create_tags = tags[:create].curry([{ name: 'red' }, { name: 'blue' }])
 
             command = create_user >> create_task >> create_tags
 

data/spec/integration/plugins/auto_restrictions_spec.rb

@@ -31,6 +31,10 @@ RSpec.describe 'Plugins / :auto_restrictions', seeds: true do
             attribute :id, ROM::SQL::Types::Serial
             attribute :user_id, ROM::SQL::Types::Int
             attribute :title, ROM::SQL::Types::String.meta(index: true)
+
+            indexes do
+              index :user_id, :title
+            end
           end
 
           use :auto_restrictions
@@ -38,6 +42,33 @@ RSpec.describe 'Plugins / :auto_restrictions', seeds: true do
       end
 
       include_context 'auto-generated restriction view'
+
+      it 'generates restrictrions by a composite index' do
+        expect(tasks.by_user_id_and_title(1, "Jane's task").first).to eql(id: 2, user_id: 1, title: "Jane's task")
+      end
+    end
+
+    if metadata[:postgres]
+      # An auto-generated restriction should include the prediate from the index definition
+      # but it seems to be too much from my POV, better leave it to the user
+      # Note that this can be enabled later
+      it 'skips partial indexes' do
+        conf.relation(:tasks) do
+          schema do
+            attribute :id, ROM::SQL::Types::Serial
+            attribute :user_id, ROM::SQL::Types::Int
+            attribute :title, ROM::SQL::Types::String
+
+            indexes do
+              index :title, predicate: 'title is not null'
+            end
+          end
+
+          use :auto_restrictions
+        end
+
+        expect(tasks).not_to respond_to(:by_title)
+      end
     end
   end
 end

data/spec/integration/relation_schema_spec.rb

@@ -199,5 +199,73 @@ RSpec.describe 'Inferring schema from database' do
         expect(tag_associations[:published_posts].definition).to eql(assoc)
       end
     end
+
+    context 'defining indexes', :helpers do |ctx|
+      it 'allows defining indexes' do
+        class Test::Tags < ROM::Relation[:sql]
+          schema(:tags) do
+            attribute :id,         Types::Serial
+            attribute :name,       Types::String
+            attribute :created_at, Types::Time
+            attribute :updated_at, Types::Time
+
+            indexes do
+              index :name
+              index :created_at, :name
+              index :updated_at, name: :recently_idx
+              index :created_at, name: :unique_date, unique: true
+            end
+          end
+        end
+
+        conf.register_relation(Test::Tags)
+        schema = container.relations[:tags].schema
+
+        expect(schema.indexes.to_a).
+          to contain_exactly(
+               ROM::SQL::Index.new([define_attribute(:name, :String, source: schema.name)]),
+               ROM::SQL::Index.new(
+                 [define_attribute(:created_at, :Time, source: schema.name),
+                  define_attribute(:name, :String, source: schema.name)]
+               ),
+               ROM::SQL::Index.new(
+                 [define_attribute(:updated_at, :Time, source: schema.name)],
+                 name: :recently_idx
+               ),
+               ROM::SQL::Index.new(
+                 [define_attribute(:created_at, :Time, source: schema.name)],
+                 name: :unique_date,
+                 unique: true
+               )
+             )
+      end
+
+      if metadata[:postgres]
+        it 'can provide index type' do
+          class Test::Tags < ROM::Relation[:sql]
+            schema(:tags) do
+              attribute :id,         Types::Serial
+              attribute :name,       Types::String
+
+              indexes do
+                index :name, type: :gist
+              end
+            end
+          end
+
+          conf.register_relation(Test::Tags)
+          schema = container.relations[:tags].schema
+          index = schema.indexes.first
+
+          expect(index).to eql(
+                             ROM::SQL::Index.new(
+                               [define_attribute(:name, :String, source: schema.name)],
+                               type: :gist)
+                           )
+
+          expect(index.type).to eql(:gist)
+        end
+      end
+    end
   end
 end

data/spec/integration/schema/inferrer_spec.rb

@@ -12,6 +12,10 @@ RSpec.describe 'Schema inference for common datatypes', seeds: false do
     Time.mktime(time.year, time.month, time.day, time.hour, time.min, time.sec, usec)
   end
 
+  def index_by_name(indexes, name)
+    indexes.find { |idx| idx.name == name }
+  end
+
   with_adapters do |adapter|
     describe 'inferring attributes' do
       before do
@@ -335,7 +339,10 @@ RSpec.describe 'Schema inference for common datatypes', seeds: false do
     end
 
     describe 'inferring indices', oracle: false do
-      before do |ex|
+      let(:dataset) { :test_inferrence }
+      let(:source) { ROM::Relation::Name[dataset] }
+
+      it 'infers types with indices' do
         conn.create_table :test_inferrence do
           primary_key :id
           Integer :foo
@@ -348,17 +355,35 @@ RSpec.describe 'Schema inference for common datatypes', seeds: false do
           index :baz, name: :baz2_idx
 
           index %i(bar baz), name: :composite_idx
+          index %i(foo bar), name: :unique_idx, unique: true
         end
 
         conf.relation(:test_inferrence) { schema(infer: true) }
+
+        expect(schema.indexes.map(&:name)).
+          to match_array(%i(foo_idx bar_idx baz1_idx baz2_idx composite_idx unique_idx))
+
+        unique_idx = index_by_name(schema.indexes, :unique_idx)
+
+        expect(unique_idx).to be_unique
       end
 
-      let(:dataset) { :test_inferrence }
-      let(:source) { ROM::Relation::Name[dataset] }
+      if metadata[:postgres]
+        it 'infers cutsom index types' do
+          pending 'Sequel not returning index type'
+          conn.create_table :test_inferrence do
+            primary_key :id
+            Integer :foo
+            index :foo, name: :foo_idx, type: :gist
+          end
 
-      it 'infers types with indices' do
-        expect(schema.indexes.map(&:name)).
-          to match_array(%i(foo_idx bar_idx baz1_idx baz2_idx composite_idx))
+          conf.relation(:test_inferrence) { schema(infer: true) }
+
+          index = schema.indexes.first
+
+          expect(index.name).to eql(:foo_idx)
+          expect(index.type).to eql(:gist)
+        end
       end
     end
   end

data/spec/support/helpers.rb

@@ -12,7 +12,7 @@ module Helpers
     )
   end
 
-  def define_type(name, id, **opts)
+  def define_attribute(name, id, **opts)
     ROM::SQL::Attribute.new(ROM::Types.const_get(id).meta(name: name, **opts))
   end
 

data/spec/unit/plugin/timestamp_spec.rb

@@ -97,8 +97,8 @@ RSpec.describe 'Plugin / Timestamp' do
     end
 
     it "works with chained commands" do
-      create_user = container.commands[:users].create.with(name: "John Doe")
-      create_note = container.commands[:notes].create_with_user.with(text: "new note")
+      create_user = container.commands[:users].create.curry(name: "John Doe")
+      create_note = container.commands[:notes].create_with_user.curry(text: "new note")
 
       time   = DateTime.now
       command = create_user >> create_note

data/spec/unit/types_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe ROM::SQL::Types, :postgres do
   end
 
   describe '#sql_literal', helpers: true do
-    subject(:base) { define_type(:age, :Int, source: ROM::Relation::Name.new(:users)) }
+    subject(:base) { define_attribute(:age, :Int, source: ROM::Relation::Name.new(:users)) }
 
     include_context 'database setup'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -158,7 +158,6 @@ files:
 - lib/rom/sql/commands/create.rb
 - lib/rom/sql/commands/delete.rb
 - lib/rom/sql/commands/error_wrapper.rb
-- lib/rom/sql/commands/transaction.rb
 - lib/rom/sql/commands/update.rb
 - lib/rom/sql/dsl.rb
 - lib/rom/sql/error.rb
@@ -199,6 +198,8 @@ files:
 - lib/rom/sql/schema.rb
 - lib/rom/sql/schema/associations_dsl.rb
 - lib/rom/sql/schema/attributes_inferrer.rb
+- lib/rom/sql/schema/dsl.rb
+- lib/rom/sql/schema/index_dsl.rb
 - lib/rom/sql/schema/inferrer.rb
 - lib/rom/sql/spec/support.rb
 - lib/rom/sql/tasks/migration_tasks.rake
@@ -231,12 +232,12 @@ files:
 - 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/combine_with_spec.rb
 - spec/integration/commands/create_spec.rb
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/update_spec.rb
 - spec/integration/commands/upsert_spec.rb
 - spec/integration/gateway_spec.rb
-- spec/integration/graph_spec.rb
 - spec/integration/migration_spec.rb
 - spec/integration/plugins/associates/many_to_many_spec.rb
 - spec/integration/plugins/associates_spec.rb
@@ -368,12 +369,12 @@ test_files:
 - 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/combine_with_spec.rb
 - spec/integration/commands/create_spec.rb
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/update_spec.rb
 - spec/integration/commands/upsert_spec.rb
 - spec/integration/gateway_spec.rb
-- spec/integration/graph_spec.rb
 - spec/integration/migration_spec.rb
 - spec/integration/plugins/associates/many_to_many_spec.rb
 - spec/integration/plugins/associates_spec.rb

data/lib/rom/sql/commands/transaction.rb

@@ -1,33 +0,0 @@
-require 'rom/commands/result'
-
-module ROM
-  module SQL
-    module Commands
-      # Adds transaction interface to commands
-      #
-      # @api private
-      module Transaction
-        ROM::SQL::Rollback = Class.new(Sequel::Rollback)
-
-        # Start a transaction
-        #
-        # @param [Hash] options The options hash supported by Sequel
-        #
-        # @return [ROM::Commands::Result::Success,ROM::Commands::Result::Failure]
-        #
-        # @api public
-        def transaction(options = {}, &block)
-          result = relation.dataset.db.transaction(options, &block)
-
-          if result
-            ROM::Commands::Result::Success.new(result)
-          else
-            ROM::Commands::Result::Failure.new(result)
-          end
-        rescue ROM::CommandError => e
-          ROM::Commands::Result::Failure.new(e)
-        end
-      end
-    end
-  end
-end