rom-sql 0.6.1 → 0.7.0.beta1

data/lib/rom/sql/plugin/associates.rb

@@ -64,13 +64,11 @@ module ROM
           # @api public
           def associates(name, options)
             if associations.include?(name)
-              raise(
-                ArgumentError,
+              raise ArgumentError,
                 "#{name} association is already defined for #{self.class}"
-              )
             end
 
-            option :association, reader: true, default: -> command { options }
+            option :association, reader: true, default: -> _command { options }
             include InstanceMethods
 
             associations << name

data/lib/rom/sql/plugin/pagination.rb

@@ -4,7 +4,7 @@ module ROM
       module Pagination
         class Pager
           include Options
-          include Equalizer.new(:dataset, :options)
+          include Dry::Equalizer(:dataset, :options)
 
           option :current_page, reader: true, default: 1
           option :per_page, reader: true

data/lib/rom/sql/plugins.rb

@@ -1,8 +1,10 @@
-require "rom/sql/plugin/associates"
-require "rom/sql/plugin/pagination"
+require 'rom/sql/plugin/assoc_macros'
+require 'rom/sql/plugin/associates'
+require 'rom/sql/plugin/pagination'
 
 ROM.plugins do
   adapter :sql do
+    register :assoc_macros, ROM::SQL::Plugin::AssocMacros, type: :relation
     register :pagination, ROM::SQL::Plugin::Pagination, type: :relation
     register :associates, ROM::SQL::Plugin::Associates, type: :command
   end

data/lib/rom/sql/relation.rb

@@ -1,10 +1,13 @@
 require 'rom/sql/header'
 
-require 'rom/sql/relation/class_methods'
 require 'rom/sql/relation/reading'
 require 'rom/sql/relation/writing'
-require 'rom/sql/relation/inspection'
-require 'rom/sql/relation/associations'
+
+require 'rom/plugins/relation/view'
+require 'rom/plugins/relation/key_inference'
+require 'rom/plugins/relation/sql/base_view'
+require 'rom/plugins/relation/sql/auto_combine'
+require 'rom/plugins/relation/sql/auto_wrap'
 
 module ROM
   module SQL
@@ -13,10 +16,12 @@ module ROM
     class Relation < ROM::Relation
       adapter :sql
 
-      extend ClassMethods
+      use :key_inference
+      use :view
+      use :base_view
+      use :auto_combine
+      use :auto_wrap
 
-      include Inspection
-      include Associations
       include Writing
       include Reading
 
@@ -28,6 +33,41 @@ module ROM
       # @attr_reader [Symbol] table
       attr_reader :table
 
+      # Set default dataset for a relation sub-class
+      #
+      # @api private
+      def self.inherited(klass)
+        super
+
+        klass.class_eval do
+          dataset do
+            table = opts[:from].first
+
+            if db.table_exists?(table)
+              # quick fix for dbs w/o primary_key inference
+              #
+              # TODO: add a way of setting a pk explicitly on a relation
+              pk =
+                if db.respond_to?(:primary_key)
+                  Array(db.primary_key(table))
+                else
+                  [:id]
+                end.map { |name| :"#{table}__#{name}" }
+
+                select(*columns).order(*pk)
+            else
+              self
+            end
+          end
+        end
+      end
+
+      def self.primary_key(value)
+        option :primary_key, reader: true, default: value
+      end
+
+      primary_key :id
+
       # @api private
       def initialize(dataset, registry = {})
         super

data/lib/rom/sql/relation/reading.rb

@@ -175,6 +175,54 @@ module ROM
           __new__(dataset.__send__(__method__, *args, &block))
         end
 
+        # Returns a result of SQL SUM clause.
+        #
+        # @example
+        #   users.sum(:age)
+        #
+        # @return Number
+        #
+        # @api public
+        def sum(*args)
+          dataset.__send__(__method__, *args)
+        end
+
+        # Returns a result of SQL MIN clause.
+        #
+        # @example
+        #   users.min(:age)
+        #
+        # @return Number
+        #
+        # @api public
+        def min(*args)
+          dataset.__send__(__method__, *args)
+        end
+
+        # Returns a result of SQL MAX clause.
+        #
+        # @example
+        #   users.max(:age)
+        #
+        # @return Number
+        #
+        # @api public
+        def max(*args)
+          dataset.__send__(__method__, *args)
+        end
+
+        # Returns a result of SQL AVG clause.
+        #
+        # @example
+        #   users.avg(:age)
+        #
+        # @return Number
+        #
+        # @api public
+        def avg(*args)
+          dataset.__send__(__method__, *args)
+        end
+
         # Restrict a relation to match criteria
         #
         # @example
@@ -323,6 +371,21 @@ module ROM
         def select_group(*args, &block)
           __new__(dataset.__send__(__method__, *args, &block))
         end
+
+        # Adds a UNION clause for relation dataset using second relation dataset
+        #
+        # @param [Relation] relation object
+        #
+        # @example
+        #   users.where(id: 1).union(users.where(id: 2))
+        #   # => [{ id: 1, name: 'Piotr' }, { id: 2, name: 'Jane' }]
+        #
+        # @return [Relation]
+        #
+        # @api public
+        def union(relation, *args, &block)
+          __new__(dataset.__send__(__method__, relation.dataset, *args, &block))
+        end
       end
     end
   end

data/lib/rom/sql/tasks/migration_tasks.rake

@@ -1,41 +1,62 @@
 require "pathname"
 require "fileutils"
 
+module ROM
+  module SQL
+    module RakeSupport
+      class << self
+        def run_migrations(options = {})
+          gateway.run_migrations(options)
+        end
+
+        def create_migration(*args)
+          gateway.migrator.create_file(*args)
+        end
+
+        private
+
+        def gateway
+          ROM::SQL::Gateway.instance
+        end
+      end
+    end
+  end
+end
+
 namespace :db do
   desc "Perform migration reset (full erase and migration up)"
-  task reset: :setup do
-    gateway = ROM::SQL.gateway
-    gateway.run_migrations(target: 0)
-    gateway.run_migrations
+  task :rom_configuration do
+    Rake::Task["db:setup"].invoke
+  end
+
+  task reset: :rom_configuration do
+    ROM::SQL::RakeSupport.run_migrations(target: 0)
+    ROM::SQL::RakeSupport.run_migrations
     puts "<= db:reset executed"
   end
 
   desc "Migrate the database (options [version_number])]"
-  task :migrate, [:version] => :setup do |_, args|
-    gateway = ROM::SQL.gateway
+  task :migrate, [:version] => :rom_configuration do |_, args|
     version = args[:version]
 
     if version.nil?
-      gateway.run_migrations
+      ROM::SQL::RakeSupport.run_migrations
       puts "<= db:migrate executed"
     else
-      gateway.run_migrations(target: version.to_i)
+      ROM::SQL::RakeSupport.run_migrations(target: version.to_i)
       puts "<= db:migrate version=[#{version}] executed"
     end
   end
 
   desc "Perform migration down (erase all data)"
-  task clean: :setup do
-    gateway = ROM::SQL.gateway
-
-    gateway.run_migrations(target: 0)
+  task clean: :rom_configuration do
+    ROM::SQL::RakeSupport.run_migrations(target: 0)
     puts "<= db:clean executed"
   end
 
   desc "Create a migration (parameters: NAME, VERSION)"
-  task :create_migration, [:name, :version] => :setup do |_, args|
-    gateway = ROM::SQL.gateway
-    name, version = args[:name], args[:version]
+  task :create_migration, [:name, :version] => :rom_configuration do |_, args|
+    name, version = args.values_at(:name, :version)
 
     if name.nil?
       puts "No NAME specified. Example usage:
@@ -43,7 +64,7 @@ namespace :db do
       exit
     end
 
-    path = gateway.migrator.create_file(*[name, version].compact)
+    path = ROM::SQL::RakeSupport.create_migration(*[name, version].compact)
 
     puts "<= migration file created #{path}"
   end

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '0.6.1'.freeze
+    VERSION = '0.7.0.beta1'.freeze
   end
 end

data/rom-sql.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "sequel", "~> 4.18"
-  spec.add_runtime_dependency "equalizer", "~> 0.0", ">= 0.0.9"
-  spec.add_runtime_dependency "rom", "~> 0.9", ">= 0.9.0"
+  spec.add_runtime_dependency "dry-equalizer", "~> 0.2"
+  spec.add_runtime_dependency "rom", "~> 1.0.0.beta1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/fixtures/migrations/20150403090603_create_carrots.rb

@@ -1,4 +1,4 @@
-ROM.env.gateways[:default].migration do
+ROM::SQL.migration do
   change do
     create_table :carrots do
       primary_key :id

data/spec/integration/combine_spec.rb

@@ -4,19 +4,19 @@ describe 'Eager loading' do
   include_context 'users and tasks'
 
   before do
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def by_name(name)
         where(name: name)
       end
     end
 
-    setup.relation(:tasks) do
+    configuration.relation(:tasks) do
       def for_users(users)
         where(user_id: users.map { |tuple| tuple[:id] })
       end
     end
 
-    setup.relation(:tags) do
+    configuration.relation(:tags) do
       def for_tasks(tasks)
         inner_join(:task_tags, task_id: :id)
           .where(task_id: tasks.map { |tuple| tuple[:id] })
@@ -25,9 +25,9 @@ describe 'Eager loading' do
   end
 
   it 'issues 3 queries for 3 combined relations' do
-    users = rom.relation(:users).by_name('Piotr')
-    tasks = rom.relation(:tasks)
-    tags = rom.relation(:tags)
+    users = container.relation(:users).by_name('Piotr')
+    tasks = container.relation(:tasks)
+    tags = container.relation(:tags)
 
     relation = users.combine(tasks.for_users.combine(tags.for_tasks))
 

data/spec/integration/commands/create_spec.rb

@@ -4,8 +4,8 @@ require 'virtus'
 describe 'Commands / Create' do
   include_context 'database setup'
 
-  subject(:users) { rom.commands.users }
-  subject(:tasks) { rom.commands.tasks }
+  subject(:users) { container.commands.users }
+  subject(:tasks) { container.commands.tasks }
 
   before do
     class Params
@@ -18,12 +18,12 @@ describe 'Commands / Create' do
       end
     end
 
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:create) do
         input Params
 
         validator -> tuple {
-          raise ROM::CommandError.new('name cannot be empty') if tuple[:name] == ''
+          raise ROM::CommandError, 'name cannot be empty' if tuple[:name] == ''
         }
 
         result :one
@@ -34,12 +34,12 @@ describe 'Commands / Create' do
       end
     end
 
-    setup.commands(:tasks) do
+    configuration.commands(:tasks) do
       define(:create)
     end
 
-    setup.relation(:users)
-    setup.relation(:tasks)
+    configuration.relation(:users)
+    configuration.relation(:tasks)
   end
 
   context '#transaction' do
@@ -53,7 +53,7 @@ describe 'Commands / Create' do
 
     it 'creates multiple records if nothing was raised' do
       result = users.create.transaction {
-        users.create_many.call([{name: 'Jane'}, {name: 'Jack'}])
+        users.create_many.call([{ name: 'Jane' }, { name: 'Jack' }])
       }
 
       expect(result.value).to match_array([
@@ -78,14 +78,14 @@ describe 'Commands / Create' do
         result = users.create.transaction {
           users.create.call(name: 'Jane')
           users.create.call(name: '')
-        } >-> value {
+        } >-> _value {
           passed = true
         }
 
         expect(result.value).to be(nil)
         expect(result.error.message).to eql('name cannot be empty')
         expect(passed).to be(false)
-      }.to_not change { rom.relations.users.count }
+      }.to_not change { container.relations.users.count }
     end
 
     it 'creates nothing if rollback was raised' do
@@ -96,14 +96,14 @@ describe 'Commands / Create' do
           users.create.call(name: 'Jane')
           users.create.call(name: 'John')
           raise ROM::SQL::Rollback
-        } >-> value {
+        } >-> _value {
           passed = true
         }
 
         expect(result.value).to be(nil)
         expect(result.error).to be(nil)
         expect(passed).to be(false)
-      }.to_not change { rom.relations.users.count }
+      }.to_not change { container.relations.users.count }
     end
 
     it 'creates nothing if constraint error was raised' do
@@ -114,14 +114,14 @@ describe 'Commands / Create' do
           users.create.transaction {
             users.create.call(name: 'Jane')
             users.create.call(name: 'Jane')
-          } >-> value {
+          } >-> _value {
             passed = true
           }
         rescue => error
           expect(error).to be_instance_of(ROM::SQL::UniqueConstraintError)
           expect(passed).to be(false)
         end
-      }.to_not change { rom.relations.users.count }
+      }.to_not change { container.relations.users.count }
     end
 
     it 'creates nothing if anything was raised in any nested transaction' do
@@ -135,7 +135,7 @@ describe 'Commands / Create' do
             }
           }
         }.to raise_error(Exception)
-      }.to_not change { rom.relations.users.count }
+      }.to_not change { container.relations.users.count }
     end
   end
 
@@ -158,7 +158,7 @@ describe 'Commands / Create' do
   it 're-raises not-null constraint violation error' do
     expect {
       users.try { users.create.call(name: nil) }
-    }.to raise_error(ROM::SQL::NotNullConstraintError, /not-null/)
+    }.to raise_error(ROM::SQL::NotNullConstraintError)
   end
 
   it 're-raises uniqueness constraint violation error' do
@@ -168,7 +168,7 @@ describe 'Commands / Create' do
       } >-> user {
         users.try { users.create.call(name: user[:name]) }
       }
-    }.to raise_error(ROM::SQL::UniqueConstraintError, /unique/)
+    }.to raise_error(ROM::SQL::UniqueConstraintError)
   end
 
   it 're-raises check constraint violation error' do
@@ -182,7 +182,7 @@ describe 'Commands / Create' do
   it 're-raises fk constraint violation error' do
     expect {
       tasks.try {
-        tasks.create.call(user_id: 918273645)
+        tasks.create.call(user_id: 918_273_645)
       }
     }.to raise_error(ROM::SQL::ForeignKeyConstraintError, /user_id/)
   end
@@ -203,15 +203,15 @@ describe 'Commands / Create' do
 
   describe '.associates' do
     it 'sets foreign key prior execution for many tuples' do
-      setup.commands(:tasks) do
+      configuration.commands(:tasks) do
         define(:create) do
           associates :user, key: [:user_id, :id]
         end
       end
 
-      create_user = rom.command(:users).create.with(name: 'Jade')
+      create_user = container.command(:users).create.with(name: 'Jade')
 
-      create_task = rom.command(:tasks).create.with([
+      create_task = container.command(:tasks).create.with([
         { title: 'Task one' }, { title: 'Task two' }
       ])
 
@@ -226,15 +226,15 @@ describe 'Commands / Create' do
     end
 
     it 'sets foreign key prior execution for one tuple' do
-      setup.commands(:tasks) do
+      configuration.commands(:tasks) do
         define(:create) do
           result :one
           associates :user, key: [:user_id, :id]
         end
       end
 
-      create_user = rom.command(:users).create.with(name: 'Jade')
-      create_task = rom.command(:tasks).create.with(title: 'Task one')
+      create_user = container.command(:users).create.with(name: 'Jade')
+      create_task = container.command(:tasks).create.with(title: 'Task one')
 
       command = create_user >> create_task
 
@@ -245,7 +245,7 @@ describe 'Commands / Create' do
 
     it 'raises when already defined' do
       expect {
-        setup.commands(:tasks) do
+        configuration.commands(:tasks) do
           define(:create) do
             result :one
             associates :user, key: [:user_id, :id]