rom-sql 3.7.0 → 4.0.0.alpha1

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/sql/type_serializer'
+require "rom/sql/type_serializer"
 
 module ROM
   module SQL
@@ -132,7 +132,6 @@ module ROM
         end
 
         class IndexAdded < IndexDiff
-          # rubocop:disable Metrics/AbcSize
           def options
             options = {}
             options[:name] = index.name unless index.name.nil?
@@ -141,7 +140,6 @@ module ROM
             options[:where] = index.predicate unless index.predicate.nil?
             options
           end
-          # rubocop:enable Metrics/AbcSize
         end
 
         class IndexRemoved < IndexDiff
@@ -178,7 +176,6 @@ module ROM
         class ForeignKeyRemoved < ForeignKeyDiff
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/MethodLength
         def call(current, target)
           if current.empty?
             TableCreated.new(
@@ -205,13 +202,13 @@ module ROM
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/MethodLength
 
-        # rubocop:disable Style/MultilineBlockChain
         def compare_attributes(current, target)
           changed_attributes = target.select { |name, attr|
             current.key?(name) && !attributes_equal?(current[name], attr)
-          }.to_h { |name, target_attr| [name, [target_attr, current[name]]] }
+          }.map { |name, target_attr|
+            [name, [target_attr, current[name]]]
+          }.to_h
           added_attributes = target.reject { |name, _| current.key?(name) }
           removed_attributes = current.reject { |name, _| target.key?(name) }
 
@@ -219,9 +216,7 @@ module ROM
             map_attributes(added_attributes, AttributeAdded) +
             map_attributes(changed_attributes, AttributeChanged)
         end
-        # rubocop:enable Style/MultilineBlockChain
 
-        # rubocop:disable Metrics/AbcSize
         def compare_indexes(current, target)
           added_indexes = target.indexes.reject { |idx|
             current.indexes.any? { |curr_idx| curr_idx.attributes == idx.attributes }
@@ -233,7 +228,6 @@ module ROM
           removed_indexes.map { |idx| IndexRemoved.new(idx) } +
             added_indexes.map { |idx| IndexAdded.new(idx) }
         end
-        # rubocop:enable Metrics/AbcSize
 
         def compare_foreign_key_constraints(current, target)
           target_fks = target.foreign_keys

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/sql/migration/recorder'
+require "rom/sql/migration/recorder"
 
 module ROM
   module SQL
@@ -33,14 +33,14 @@ module ROM
         def write(operations, buffer, indent)
           operations.each do |operation|
             op, args, nested = operation
-            buffer << indent << op.to_s << ' '
+            buffer << indent << op.to_s << " "
             write_arguments(buffer, args)
 
             next if nested.empty?
 
-            buffer << ' do'
-            write(nested, buffer, "#{indent}  ")
-            buffer << indent << 'end'
+            buffer << " do"
+            write(nested, buffer, indent + "  ")
+            buffer << indent << "end"
           end
         end
 
@@ -51,9 +51,9 @@ module ROM
             options = EMPTY_HASH
           end
 
-          buffer << args.map(&:inspect).join(', ')
+          buffer << args.map(&:inspect).join(", ")
           options.each do |key, value|
-            buffer << ', ' << key.to_s << ': ' << value.inspect
+            buffer << ", " << key.to_s << ": " << value.inspect
           end
         end
 

data/lib/rom/sql/migration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'rom/sql/migration/migrator'
-require 'rom/sql/migration/schema_diff'
+require "rom/sql/migration/migrator"
+require "rom/sql/migration/schema_diff"
 
 module ROM
   module SQL
@@ -54,12 +54,12 @@ module ROM
       #   @param [Symbol] gateway The gateway name, :default by default
       #
       # @api public
-      def migration(*args, &)
+      def migration(*args, &block)
         if args.any?
           container, gateway, * = args
-          with_gateway(container.gateways[gateway || :default]) { migration(&) }
+          with_gateway(container.gateways[gateway || :default]) { migration(&block) }
         else
-          current_gateway.migration(&)
+          current_gateway.migration(&block)
         end
       end
 
@@ -121,8 +121,8 @@ module ROM
       # @see ROM::SQL.migration
       #
       # @api public
-      def migration(&)
-        migrator.migration(&)
+      def migration(&block)
+        migrator.migration(&block)
       end
 
       # Run migrations
@@ -141,12 +141,8 @@ module ROM
       end
 
       # @api public
-      def auto_migrate!(conf, options = EMPTY_HASH)
-        schemas = conf.relation_classes(self).map do |klass|
-          klass.schema_proc.call.finalize_attributes!(gateway: self)
-        end
-
-        migrator.auto_migrate!(self, schemas, options)
+      def auto_migrate!(setup, options = EMPTY_HASH)
+        migrator.auto_migrate!(self, setup.registry.relations.map(&:schema), options)
       end
 
       private

data/lib/rom/sql/order_dsl.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/sql/dsl'
+require "rom/sql/dsl"
 
 module ROM
   module SQL
@@ -8,16 +8,12 @@ module ROM
     class OrderDSL < DSL
       private
 
-      def respond_to_missing?(_meth, _include_private = false)
-        true
-      end
-
       # @api private
-      def method_missing(meth, ...)
+      def method_missing(meth, *args, &block)
         if schema.key?(meth)
           schema[meth]
         else
-          ::Sequel::VIRTUAL_ROW.__send__(meth.to_s.upcase, ...)
+          ::Sequel::VIRTUAL_ROW.__send__(meth.to_s.upcase, *args, &block)
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/sql/associations'
+require "rom/sql/associations"
 
 module ROM
   module SQL
@@ -10,17 +10,13 @@ module ROM
       # @api private
       module Associates
         class AssociateOptions
-          attr_reader :name
-
-          attr_reader :assoc
-
-          attr_reader :opts
+          attr_reader :name, :assoc, :opts
 
           # @api private
           def initialize(name, relation, opts)
             @name = name
             @assoc = relation.associations[name]
-            @opts = { assoc: assoc, keys: assoc.join_keys }
+            @opts = {assoc: assoc, keys: assoc.join_keys}
             @opts.update(parent: opts[:parent]) if opts[:parent]
           end
 
@@ -29,7 +25,7 @@ module ROM
           end
 
           def to_hash
-            { associate: opts }
+            {associate: opts}
           end
         end
 
@@ -39,11 +35,10 @@ module ROM
             extend ClassMethods
             include InstanceMethods
 
-            defines :associations
-
-            associations({})
+            setting :associations, default: {}, reader: true
 
             option :associations, default: -> { self.class.associations }
+
             option :configured_associations, default: -> { EMPTY_ARRAY }
           end
           super
@@ -51,6 +46,39 @@ module ROM
 
         # @api public
         module ClassMethods
+          # @api private
+          def create_class(relation:, rel_meta: {}, parent_relation: nil, **, &block)
+            klass = super
+
+            if relation && rel_meta[:combine_type]
+              setup_associates(klass, relation, parent_relation)
+            end
+
+            klass
+          end
+
+          # Sets up `associates` plugin for a given command class and relation
+          #
+          # @param [Class] klass The command class
+          # @param [Relation] relation The relation for the command
+          #
+          # @api private
+          def setup_associates(klass, relation, parent_relation)
+            assoc_name =
+              if relation.associations.key?(parent_relation)
+                parent_relation
+              else
+                singular_name = relation.inflector.singularize(parent_relation).to_sym
+                singular_name if relation.associations.key?(singular_name)
+              end
+
+            if assoc_name
+              klass.associates(assoc_name)
+            else
+              klass.associates(parent_relation)
+            end
+          end
+
           # @see ROM::Command::ClassInterface.build
           #
           # @api public
@@ -101,7 +129,9 @@ module ROM
                     "#{name} association is already defined for #{self.class}"
             end
 
-            associations(associations.merge(name => options))
+            associations[name] = options
+
+            self
           end
         end
 
@@ -115,14 +145,8 @@ module ROM
           #
           # @api public
           #
-          # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
-          def associate(
-            tuples,
-            curried_parent = nil,
-            assoc:,
-            keys:, # rubocop:disable Lint/UnusedMethodArgument
-            parent: curried_parent
-          )
+          # rubocop:disable Lint/UnusedMethodArgument
+          def associate(tuples, curried_parent = nil, assoc:, keys:, parent: curried_parent)
             result_type = result
 
             output_tuples =
@@ -150,7 +174,7 @@ module ROM
 
             result_type == :one ? output_tuples[0] : output_tuples
           end
-          # rubocop:enable Metrics/PerceivedComplexity, Metrics/AbcSize
+          # rubocop:enable Lint/UnusedMethodArgument
 
           # Return a new command with the provided association
           #

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require 'rom/initializer'
+require "dry/core/equalizer"
+
+require "rom/initializer"
 
 module ROM
   module SQL

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "dry/effects"
+require "rom/sql/schema/index_dsl"
+
+module ROM
+  module SQL
+    module Plugin
+      module SchemaIndexes
+        # @api public
+        module DSL
+          # Define indexes within a block
+          #
+          # @api public
+          def indexes(&block)
+            index_dsl.instance_eval(&block)
+          end
+
+          # @api private
+          def configure
+            super
+            config.options.update(indexes: index_dsl.(config.id, attributes.values))
+          end
+
+          private
+
+          # @api private
+          def index_dsl
+            @index_dsl ||= Schema::IndexDSL.new(attr_class: config.attr_class)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rom/sql/plugins.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
-require 'rom/plugins/relation/sql/instrumentation'
-require 'rom/plugins/relation/sql/auto_restrictions'
+require "rom/plugins/relation/sql/instrumentation"
+require "rom/plugins/relation/sql/default_views"
+require "rom/plugins/relation/sql/auto_restrictions"
 
-require 'rom/sql/plugin/associates'
-require 'rom/sql/plugin/nullify'
-require 'rom/sql/plugin/pagination'
+require "rom/sql/plugin/associates"
+require "rom/sql/plugin/nullify"
+require "rom/sql/plugin/pagination"
+require "rom/sql/plugin/schema_indexes"
 
 ROM.plugins do
-  adapter :sql do
+  adapter(:sql) do
     register :nullify, ROM::SQL::Plugin::Nullify, type: :relation
     register :pagination, ROM::SQL::Plugin::Pagination, type: :relation
     register :associates, ROM::SQL::Plugin::Associates, type: :command
+    register :indexes, ROM::SQL::Plugin::SchemaIndexes, type: :schema
   end
 end

data/lib/rom/sql/projection_dsl.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'rom/sql/dsl'
-require 'rom/sql/function'
+require "rom/sql/dsl"
+require "rom/sql/function"
 
 module ROM
   module SQL
@@ -37,7 +37,7 @@ module ROM
       #
       # @api public
       def function(name, *attrs)
-        ::ROM::SQL::Function.new(::ROM::Types::Any).meta(schema: schema).public_send(name, *attrs)
+        ::ROM::SQL::Function.new(::ROM::Types::Any, schema: schema).public_send(name, *attrs)
       end
       alias_method :f, :function
 
@@ -49,7 +49,7 @@ module ROM
       private
 
       # @api private
-      def method_missing(meth, *args, &)
+      def method_missing(meth, *args, &block)
         if schema.key?(meth)
           schema[meth]
         else
@@ -57,7 +57,7 @@ module ROM
 
           if type
             if args.empty?
-              ::ROM::SQL::Function.new(type).meta(schema: schema)
+              ::ROM::SQL::Function.new(type, schema: schema)
             else
               ::ROM::SQL::Attribute[type].value(args[0])
             end

data/lib/rom/sql/rake_task.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-require 'rake'
-load 'rom/sql/tasks/migration_tasks.rake'
+require "rake"
+load "rom/sql/tasks/migration_tasks.rake"