rom-sql 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff0be19f60330b9224eaf421b85ad113000c1558
-  data.tar.gz: 3ccb799110fbc7543f3e9ef9ebd511193c700ab6
+  metadata.gz: 8f6a088c5111442c8a6ac85b97315143395afd3a
+  data.tar.gz: 909c97090b071f2229b84055686ea34c0a31d9e2
 SHA512:
-  metadata.gz: fe36e8c1a886f3231385d3ff9709aa11a4ad13b63b313ec5fd07fc76af0537327184bef102af03c66331750b76d0edfd7838e1ec4e02e8189ac56f91c7749203
-  data.tar.gz: 3192a10d465305f01d780e4db7af846c14c3c09509afb59f5cdad770383234ab59fc80b49431270aa863adeb7a51f7f3867a05c48cdfde084c7ed1ac1ea83a19
+  metadata.gz: ebaf850abe38152fad88f59e91a50ecd2ea882b5e9159a252f30b32da5b383dfd8a8079095454daf7c5cffefd8e72da20f7c7c86094f50a4109b0f5fd00bbd09
+  data.tar.gz: 36d28232439734adc2de2f440a28cc57374250efbd001bb4291939ea39c01d7e9cddf1020833bf840baf450ae2f8bee9319b0fd5a8bc93cfcb5eacfb4c26efc7

data/CHANGELOG.md

@@ -7,8 +7,9 @@
 
 ### Changed
 
-* [BREAKING] based on rom 4.0 now
+* [BREAKING] based on rom 4.0 now (flash-gordon + solnic)
 * [BREAKING] `Associates` command plugin requires associations now (solnic)
+* [BREAKING] `Command#transaction` is gone in favor of `Relation#transaction` (solnic)
 * `ManyToOne` no longer uses a join (solnic)
 * `AutoCombine` and `AutoWrap` plugins were removed as this functionality is provided by core API (solnic)
 

data/lib/rom/plugins/relation/sql/auto_restrictions.rb

@@ -39,18 +39,31 @@ module ROM
           def self.restriction_methods(schema)
             mod = Module.new
 
-            indexed_attrs = schema.indexes.map { |index| index.attributes[0] }.uniq
+            methods = schema.indexes.each_with_object([]) do |index, generated|
+              next if index.partial?
 
-            methods = indexed_attrs.map do |attr|
-              meth_name = :"by_#{attr.name}"
+              attributes = index.to_a
+              meth_name = :"by_#{ attributes.map(&:name).join('_and_') }"
+
+              next if generated.include?(meth_name)
 
               mod.module_eval do
-                define_method(meth_name) do |value|
-                  where(attr.is(value))
+                if attributes.size == 1
+                  attribute = attributes[0]
+
+                  define_method(meth_name) do |value|
+                    where(attribute.is(value))
+                  end
+                else
+                  indexed_attributes = attributes.map.with_index.to_a
+
+                  define_method(meth_name) do |*values|
+                    where(indexed_attributes.map { |attr, idx| attr.is(values[idx]) }.reduce(:&))
+                  end
                 end
               end
 
-              meth_name
+              generated << meth_name
             end
 
             [methods, mod]

data/lib/rom/sql/attribute.rb

@@ -306,6 +306,15 @@ module ROM
         meta
       end
 
+      # @api private
+      def unwrap
+        if optional?
+          self.class.new(right, options).meta(meta)
+        else
+          self
+        end
+      end
+
       private
 
       # Return Sequel Expression object for an attribute

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

@@ -1,5 +1,4 @@
 require 'rom/sql/commands/error_wrapper'
-require 'rom/sql/commands/transaction'
 
 module ROM
   module SQL
@@ -10,7 +9,6 @@ module ROM
       class Create < ROM::Commands::Create
         adapter :sql
 
-        include Transaction
         include ErrorWrapper
 
         use :associates

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

@@ -1,5 +1,4 @@
 require 'rom/sql/commands/error_wrapper'
-require 'rom/sql/commands/transaction'
 
 module ROM
   module SQL
@@ -10,7 +9,6 @@ module ROM
       class Delete < ROM::Commands::Delete
         adapter :sql
 
-        include Transaction
         include ErrorWrapper
 
         # Deletes tuples from a relation

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

@@ -1,5 +1,4 @@
 require 'rom/sql/commands/error_wrapper'
-require 'rom/sql/commands/transaction'
 
 module ROM
   module SQL
@@ -10,7 +9,6 @@ module ROM
       class Update < ROM::Commands::Update
         adapter :sql
 
-        include Transaction
         include ErrorWrapper
 
         use :schema

data/lib/rom/sql/extensions/postgres/attributes_inferrer.rb

@@ -34,7 +34,7 @@ module ROM
           'path' => Types::PG::PathT
         ).freeze
 
-        db_array_type_matcher Sequel::Postgres::PGArray::EMPTY_BRACKET
+        db_array_type_matcher '[]'.freeze
 
         private
 

data/lib/rom/sql/index.rb

@@ -8,6 +8,22 @@ module ROM
       param :attributes
 
       option :name, optional: true
+
+      option :unique, default: -> { false }
+
+      alias_method :unique?, :unique
+
+      option :type, optional: true
+
+      option :predicate, optional: true
+
+      def to_a
+        attributes
+      end
+
+      def partial?
+        !predicate.nil?
+      end
     end
   end
 end

data/lib/rom/sql/migration/inline_runner.rb

@@ -37,8 +37,12 @@ module ROM
                 end
               end
 
-              diff.indexes.each do |idx|
-                index idx.attribute
+              diff.indexes.each do |index|
+                index index.attributes,
+                      name: index.name,
+                      unique: index.unique?,
+                      type: index.type,
+                      where: index.predicate
               end
             end
           end
@@ -72,9 +76,13 @@ module ROM
               diff.index_changes.each do |index|
                 case index
                 when SchemaDiff::IndexAdded
-                  add_index index.attribute
+                  add_index index.attributes,
+                            name: index.name,
+                            unique: index.unique?,
+                            type: index.type,
+                            where: index.predicate
                 when SchemaDiff::IndexRemoved
-                  drop_index index.attribute
+                  drop_index index.attributes, name: index.name
                 end
               end
             end

data/lib/rom/sql/migration/schema_diff.rb

@@ -111,8 +111,28 @@ module ROM
             @index = index
           end
 
-          def attribute
-            index.attributes[0].name
+          def attributes
+            index.attributes.map(&:name)
+          end
+
+          def name
+            index.name
+          end
+
+          def unique?
+            index.unique?
+          end
+
+          def type
+            index.type
+          end
+
+          def predicate
+            index.predicate
+          end
+
+          def partial?
+            !predicate.nil?
           end
         end
 
@@ -165,7 +185,7 @@ module ROM
             current.indexes.any? { |curr_idx| curr_idx.attributes == idx.attributes }
           }
           removed_indexes = current.indexes.select { |idx|
-            target.indexes.none? { |tgt_idx| idx.attributes == tgt_idx  }
+            target.indexes.none? { |tgt_idx| idx.attributes == tgt_idx.attributes }
           }
 
           removed_indexes.map { |idx| IndexRemoved.new(idx) } +

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

@@ -60,7 +60,7 @@ module ROM
             after_hooks = associate_options.select(&:after?).map(&:to_hash)
 
             command.
-              with_opts(configured_associations: configured_assocs + associate_options.map(&:name)).
+              with(configured_associations: configured_assocs + associate_options.map(&:name)).
               before(*before_hooks).
               after(*after_hooks)
           end
@@ -73,10 +73,10 @@ module ROM
           #     associates :user, key: [:user_id, :id]
           #   end
           #
-          #   create_user = rom.command(:user).create.with(name: 'Jane')
+          #   create_user = rom.command(:user).create.curry(name: 'Jane')
           #
           #   create_tasks = rom.command(:tasks).create
-          #     .with [{ title: 'One' }, { title: 'Two' } ]
+          #     .curry [{ title: 'One' }, { title: 'Two' } ]
           #
           #   command = create_user >> create_tasks
           #   command.call

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

@@ -33,7 +33,7 @@ module ROM
           #     timestamps :created_at, :updated_at
           #   end
           #
-          #   create_user = rom.command(:user).create.with(name: 'Jane')
+          #   create_user = rom.command(:user).create.curry(name: 'Jane')
           #
           #   result = create_user.call
           #   result[:created_at]  #=> Time.now.utc
@@ -57,7 +57,7 @@ module ROM
           #     datestamps :created_on, :updated_on
           #   end
           #
-          #   create_user = rom.command(:user).create.with(name: 'Jane')
+          #   create_user = rom.command(:user).create.curry(name: 'Jane')
           #
           #   result = create_user.call
           #   result[:created_at]  #=> Date.today

data/lib/rom/sql/relation.rb

@@ -2,6 +2,7 @@ require 'rom/sql/types'
 require 'rom/sql/schema'
 require 'rom/sql/attribute'
 require 'rom/sql/wrap'
+require 'rom/sql/transaction'
 
 require 'rom/sql/relation/reading'
 require 'rom/sql/relation/writing'
@@ -24,6 +25,7 @@ module ROM
       schema_class SQL::Schema
       schema_attr_class SQL::Attribute
       schema_inferrer ROM::SQL::Schema::Inferrer.new.freeze
+      schema_dsl SQL::Schema::DSL
       wrap_class SQL::Wrap
 
       subscribe('configuration.relations.schema.set', adapter: :sql) do |event|
@@ -113,6 +115,11 @@ module ROM
         associations[name].()
       end
 
+      # @api public
+      def transaction(opts = EMPTY_HASH, &block)
+        Transaction.new(dataset.db).run(opts, &block)
+      end
+
       # Return raw column names
       #
       # @return [Array<Symbol>]

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

@@ -851,7 +851,7 @@ module ROM
           clause = lock_clause(options)
 
           if block
-            dataset.db.transaction do
+            transaction do
               block.call(dataset.lock_style(clause).to_a)
             end
           else

data/lib/rom/sql/schema.rb

@@ -1,5 +1,6 @@
 require 'rom/schema'
 
+require 'rom/sql/schema/dsl'
 require 'rom/sql/order_dsl'
 require 'rom/sql/group_dsl'
 require 'rom/sql/projection_dsl'
@@ -12,7 +13,7 @@ module ROM
     class Schema < ROM::Schema
       # @!attribute [r] attributes
       #   @return [Array<Index>] Array with schema indexes
-      option :indexes, default: -> { EMPTY_ARRAY }
+      option :indexes, default: -> { EMPTY_SET }
 
       # @api public
       def restriction(&block)

data/lib/rom/sql/schema/dsl.rb

@@ -0,0 +1,26 @@
+require 'rom/sql/schema/index_dsl'
+
+module ROM
+  module SQL
+    class Schema < ROM::Schema
+      # @api public
+      class DSL < ROM::Schema::DSL
+        attr_reader :index_dsl
+
+        def indexes(&block)
+          @index_dsl = IndexDSL.new(options, &block)
+        end
+
+        def opts
+          if index_dsl
+            opts = super
+
+            { **opts, indexes: index_dsl.(relation, opts[:attributes]) }
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rom/sql/schema/index_dsl.rb

@@ -0,0 +1,50 @@
+require 'set'
+
+module ROM
+  module SQL
+    class Schema < ROM::Schema
+      # @api public
+      class IndexDSL # < BasicObject
+        extend Initializer
+
+        option :attr_class
+
+        attr_reader :registry
+
+        # @api private
+        def initialize(*, &block)
+          super
+
+          @registry = []
+
+          instance_exec(&block)
+        end
+
+        # @api public
+        def index(*attributes, **options)
+          registry << [attributes, options]
+        end
+
+        # @api private
+        def call(schema_name, types)
+          attributes = types.map { |type| attr_class.new(type).meta(source: schema_name) }
+
+          registry.map { |attr_names, options|
+            build_index(attributes, attr_names, options)
+          }.to_set
+        end
+
+        private
+
+        # @api private
+        def build_index(attributes, attr_names, options)
+          index_attributes = attr_names.map do |name|
+            attributes.find { |a| a.name == name }.unwrap
+          end
+
+          Index.new(index_attributes, options)
+        end
+      end
+    end
+  end
+end

data/lib/rom/sql/schema/inferrer.rb

@@ -24,7 +24,7 @@ module ROM
         def call(schema, gateway)
           inferred = super
 
-          indexes = get_indexes(gateway, schema.name.dataset, inferred[:attributes])
+          indexes = get_indexes(gateway, schema, inferred[:attributes])
 
           { **inferred, indexes: indexes }
         rescue Sequel::Error => error
@@ -33,20 +33,26 @@ module ROM
         end
 
         # @api private
-        def get_indexes(gateway, dataset, attributes)
+        def get_indexes(gateway, schema, attributes)
+          dataset = schema.name.dataset
+
           if enabled? && gateway.connection.respond_to?(:indexes)
             gateway.connection.indexes(dataset).map { |name, body|
               columns = body[:columns].map { |name|
-                attributes.find { |attr| attr.name == name }
+                attributes.find { |attr| attr.name == name }.unwrap
               }
 
-              SQL::Index.new(columns, name: name)
+              SQL::Index.new(columns, name: name, unique: body[:unique])
             }.to_set
           else
-            attributes.select(&:indexed?).map { |attr| SQL::Index.new([attr]) }.to_set
+            schema.indexes | indexes_from_attributes(attributes)
           end
         end
 
+        def indexes_from_attributes(attributes)
+          attributes.select(&:indexed?).map { |attr| SQL::Index.new([attr.unwrap]) }.to_set
+        end
+
         # @api private
         def suppress_errors
           with(raise_on_error: false, silent: true)