rom-sql 3.7.0 → 4.0.0.alpha1

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/core/class_attributes'
+require "dry/core/class_attributes"
 
 module ROM
   module SQL
@@ -12,7 +12,7 @@ module ROM
 
         defines :type_builders
 
-        CONSTRAINT_DB_TYPE = 'add_constraint'
+        CONSTRAINT_DB_TYPE = "add_constraint"
 
         option :type_builder
 

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'rom/sql/schema/index_dsl'
+require "rom/compat/schema/dsl"
+require_relative "index_dsl"
 
 module ROM
   module SQL
@@ -8,6 +9,7 @@ module ROM
       # Specialized schema DSL with SQL-specific features
       #
       # @api public
+      # @deprecated
       class DSL < ROM::Schema::DSL
         # @!attribute [r] index_dsl
         #   @return [IndexDSL] Index DSL instance (created only if indexes block is called)
@@ -16,8 +18,8 @@ module ROM
         # Define indexes within a block
         #
         # @api public
-        def indexes(&)
-          @index_dsl = IndexDSL.new(**options, &)
+        def indexes(&block)
+          @index_dsl = IndexDSL.new(**options, &block)
         end
 
         private
@@ -29,7 +31,7 @@ module ROM
           if index_dsl
             opts = super
 
-            { **opts, indexes: index_dsl.(relation, opts[:attributes]) }
+            {**opts, indexes: index_dsl.(relation, opts[:attributes])}
           else
             super
           end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
 module ROM
   module SQL
@@ -14,13 +14,12 @@ module ROM
         attr_reader :registry
 
         # @api private
-        def initialize(*, **, &)
+        def initialize(*, &block)
           super
-
           @registry = []
-
-          instance_exec(&)
+          instance_exec(&block) if block
         end
+        ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
         # @api public
         def index(*attributes, **options)
@@ -33,9 +32,9 @@ module ROM
             attr_class.new(attr[:type], **(attr[:options] || {})).meta(source: schema_name)
           end
 
-          registry.to_set do |attr_names, options|
+          registry.map { |attr_names, options|
             build_index(attributes, attr_names, options)
-          end
+          }.to_set
         end
 
         private

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
-require 'rom/sql/schema/type_builder'
-require 'rom/sql/schema/attributes_inferrer'
-require 'rom/sql/attribute'
+require "rom/sql/schema/type_builder"
+require "rom/sql/schema/attributes_inferrer"
+require "rom/sql/attribute"
 
 module ROM
   module SQL
@@ -40,7 +40,7 @@ module ROM
           end
         rescue Sequel::Error => e
           on_error(schema.name, e)
-          { **FALLBACK_SCHEMA, indexes: schema.indexes }
+          {**FALLBACK_SCHEMA, indexes: schema.indexes}
         end
 
         # @api private
@@ -49,14 +49,12 @@ module ROM
           indexes = indexes_from_database(gateway, schema, idx)
           foreign_keys = foreign_keys_from_database(gateway, schema, idx)
 
-          {
-            **rest,
+          {**rest,
             attributes: attributes.map { |attr|
-              mark_fk(mark_indexed(attr, indexes), foreign_keys)
-            },
+                          mark_fk(mark_indexed(attr, indexes), foreign_keys)
+                        },
             foreign_keys: foreign_keys,
-            indexes: indexes
-          }
+            indexes: indexes}
         end
 
         # @api private
@@ -64,12 +62,10 @@ module ROM
           indexes = schema.indexes | indexes_from_attributes(attributes)
           foreign_keys = foreign_keys_from_attributes(attributes)
 
-          {
-            **rest,
+          {**rest,
             attributes: attributes.map { |attr| mark_indexed(attr, indexes) },
             foreign_keys: foreign_keys,
-            indexes: indexes
-          }
+            indexes: indexes}
         end
 
         # @api private
@@ -77,12 +73,12 @@ module ROM
           if gateway.connection.respond_to?(:indexes)
             dataset = schema.name.dataset
 
-            gateway.connection.indexes(dataset).to_set do |index_name, definition|
+            gateway.connection.indexes(dataset).map { |index_name, definition|
               columns, unique = definition.values_at(:columns, :unique)
               attrs = columns.map { |name| attributes[name] }
 
               SQL::Index.new(attrs, name: index_name, unique: unique)
-            end
+            }.to_set
           else
             EMPTY_SET
           end
@@ -92,26 +88,28 @@ module ROM
         def foreign_keys_from_database(gateway, schema, attributes)
           dataset = schema.name.dataset
 
-          gateway.connection.foreign_key_list(dataset).to_set do |definition|
+          gateway.connection.foreign_key_list(dataset).map { |definition|
             columns, table, key = definition.values_at(:columns, :table, :key)
             attrs = columns.map { |name| attributes[name] }
 
             SQL::ForeignKey.new(attrs, table, parent_keys: key)
-          end
+          }.to_set
         end
 
         # @api private
         def indexes_from_attributes(attributes)
           attributes
             .select(&:indexed?)
-            .to_set { |attr| SQL::Index.new([attr.unwrap]) }
+            .map { |attr| SQL::Index.new([attr.unwrap]) }
+            .to_set
         end
 
         # @api private
         def foreign_keys_from_attributes(attributes)
           attributes
             .select(&:foreign_key?)
-            .to_set { |attr| SQL::ForeignKey.new([attr.unwrap], attr.target) }
+            .map { |attr| SQL::ForeignKey.new([attr.unwrap], attr.target) }
+            .to_set
         end
 
         # @api private
@@ -155,9 +153,9 @@ module ROM
             raise e
           elsif !silent
             warn "[#{dataset}] failed to infer schema. " \
-                 'Make sure tables exist before ROM container is set up. ' \
-                 'This may also happen when your migration tasks load ROM container, ' \
-                 'which is not needed for migrations as only the connection is required ' \
+                 "Make sure tables exist before ROM container is set up. " \
+                 "This may also happen when your migration tasks load ROM container, " \
+                 "which is not needed for migrations as only the connection is required " \
                  "(#{e.message})"
           end
         end

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

@@ -21,7 +21,7 @@ module ROM
 
         defines :ruby_type_mapping, :numeric_pk_type
 
-        DECIMAL_REGEX = /(?:decimal|numeric)\((\d+)(?:,\s*(\d+))?\)/
+        DECIMAL_REGEX = /(?:decimal|numeric)\((\d+)(?:,\s*(\d+))?\)/.freeze
 
         ruby_type_mapping(
           integer: Types::Integer,
@@ -37,10 +37,6 @@ module ROM
 
         numeric_pk_type Types::Serial
 
-        TYPE_GUESSES = {
-          /datetime\((\d+)\)/ => :datetime
-        }.freeze
-
         def call(primary_key:, db_type:, type:, allow_null:, **rest)
           if primary_key
             map_pk_type(type, db_type, **rest)
@@ -67,29 +63,17 @@ module ROM
         end
 
         # @api private
-        #
-        # rubocop:disable Metrics/PerceivedComplexity
         def map_type(ruby_type, db_type, **kw)
-          type = self.class.ruby_type_mapping[ruby_type || guess_type(db_type)]
+          type = self.class.ruby_type_mapping[ruby_type]
 
-          if (db_type.is_a?(String) && db_type.include?('numeric')) || db_type.include?('decimal')
+          if (db_type.is_a?(String) && db_type.include?("numeric")) || db_type.include?("decimal")
             map_decimal_type(db_type)
-          elsif db_type.is_a?(String) && db_type.include?('char') && kw[:max_length]
+          elsif db_type.is_a?(String) && db_type.include?("char") && kw[:max_length]
             type.meta(limit: kw[:max_length])
           else
             type
           end
         end
-        # rubocop:enable Metrics/PerceivedComplexity
-
-        # @api private
-        def guess_type(db_type)
-          TYPE_GUESSES.find do |regex, type|
-            if db_type.is_a?(String) && db_type.match(regex)
-              break type
-            end
-          end
-        end
 
         # @api private
         def map_decimal_type(type)

data/lib/rom/sql/schema.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require 'rom/schema'
+require "rom/schema"
 
-require 'rom/sql/schema/dsl'
-require 'rom/sql/order_dsl'
-require 'rom/sql/group_dsl'
-require 'rom/sql/projection_dsl'
-require 'rom/sql/restriction_dsl'
-require 'rom/sql/index'
-require 'rom/sql/foreign_key'
-require 'rom/sql/schema/inferrer'
+require "rom/sql/order_dsl"
+require "rom/sql/group_dsl"
+require "rom/sql/projection_dsl"
+require "rom/sql/restriction_dsl"
+require "rom/sql/index"
+require "rom/sql/foreign_key"
+require "rom/sql/schema/inferrer"
 
 module ROM
   module SQL
@@ -32,8 +31,8 @@ module ROM
       # @return [Mixed] Result of the block call
       #
       # @api public
-      def restriction(&)
-        RestrictionDSL.new(self).call(&)
+      def restriction(&block)
+        RestrictionDSL.new(self).call(&block)
       end
 
       # Open Order DSL for setting ORDER clause in queries
@@ -43,8 +42,8 @@ module ROM
       # @return [Mixed] Result of the block call
       #
       # @api public
-      def order(&)
-        OrderDSL.new(self).call(&)
+      def order(&block)
+        OrderDSL.new(self).call(&block)
       end
 
       # Open Group DSL for setting GROUP BY clause in queries
@@ -54,8 +53,8 @@ module ROM
       # @return [Mixed] Result of the block call
       #
       # @api public
-      def group(&)
-        GroupDSL.new(self).call(&)
+      def group(&block)
+        GroupDSL.new(self).call(&block)
       end
 
       # Return a new schema with attributes marked as qualified
@@ -87,9 +86,9 @@ module ROM
       # @return [Schema] A new schema with projected attributes
       #
       # @api public
-      def project(*names, &)
-        if block_given?
-          super(*(names + ProjectionDSL.new(self).(&)))
+      def project(*names, &block)
+        if block
+          super(*(names + ProjectionDSL.new(self).(&block)))
         else
           super
         end
@@ -162,17 +161,6 @@ module ROM
         end
       end
 
-      # Finalize associations
-      #
-      # @api private
-      def finalize_associations!(relations:)
-        super do
-          associations.map do |definition|
-            SQL::Associations.const_get(definition.type).new(definition, relations)
-          end
-        end
-      end
-
       memoize :qualified, :canonical, :joined, :project_pk
     end
   end

data/lib/rom/sql/spec/support.rb

@@ -7,18 +7,18 @@ else
 end
 
 if USING_JRUBY
-  SEQUEL_TEST_DB_URI = 'jdbc:sqlite::memory:'
+  SEQUEL_TEST_DB_URI = "jdbc:sqlite::memory:"
 else
-  SEQUEL_TEST_DB_URI = 'sqlite::memory'
+  SEQUEL_TEST_DB_URI = "sqlite::memory"
 end
 
 DB = Sequel.connect(SEQUEL_TEST_DB_URI)
 
 def seed(db = DB)
-  db.run('CREATE TABLE users (id INTEGER PRIMARY KEY, name STRING)')
+  db.run("CREATE TABLE users (id INTEGER PRIMARY KEY, name STRING)")
 
-  db[:users].insert(id: 1, name: 'Jane')
-  db[:users].insert(id: 2, name: 'Joe')
+  db[:users].insert(id: 1, name: "Jane")
+  db[:users].insert(id: 2, name: "Joe")
 end
 
 def deseed(db = DB)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'pathname'
-require 'fileutils'
+require "pathname"
+require "fileutils"
 
 module ROM
   module SQL
@@ -10,11 +10,11 @@ module ROM
 
       class << self
         def run_migrations(options = {})
-          gateway.run_migrations(migration_options.merge(options))
+          gateway.run_migrations(options)
         end
 
-        def create_migration(...)
-          gateway.migrator.create_file(...)
+        def create_migration(*args)
+          gateway.migrator.create_file(*args)
         end
 
         # Global environment used for running migrations. You normally
@@ -24,12 +24,6 @@ module ROM
         # @api public
         attr_accessor :env
 
-        # Migration options, which are passed to `ROM::SQL::RakeSupport.run_migrations`. You can
-        # set them in the `db:setup` task with `ROM::SQL::RakeSupport.migration_options = { ... }`
-        #
-        # @api public
-        attr_accessor :migration_options
-
         private
 
         def gateway
@@ -37,7 +31,7 @@ module ROM
             Gateway.instance ||
               raise(
                 MissingEnv,
-                'Set up a configuration with ROM::SQL::RakeSupport.env= in the db:setup task'
+                "Set up a configuration with ROM::SQL::RakeSupport.env= in the db:setup task"
               )
           else
             env.gateways[:default]
@@ -46,43 +40,42 @@ module ROM
       end
 
       @env = nil
-      @migration_options = {}
     end
   end
 end
 
 namespace :db do
   task :rom_configuration do
-    Rake::Task['db:setup'].invoke
+    Rake::Task["db:setup"].invoke
   end
 
-  desc 'Perform migration reset (full erase and migration up)'
+  desc "Perform migration reset (full erase and migration up)"
   task reset: :rom_configuration do
     ROM::SQL::RakeSupport.run_migrations(target: 0)
     ROM::SQL::RakeSupport.run_migrations
-    puts '<= db:reset executed'
+    puts "<= db:reset executed"
   end
 
-  desc 'Migrate the database (options [version_number])]'
+  desc "Migrate the database (options [version_number])]"
   task :migrate, [:version] => :rom_configuration do |_, args|
     version = args[:version]
 
     if version.nil?
       ROM::SQL::RakeSupport.run_migrations
-      puts '<= db:migrate executed'
+      puts "<= db:migrate executed"
     else
       ROM::SQL::RakeSupport.run_migrations(target: version.to_i)
       puts "<= db:migrate version=[#{version}] executed"
     end
   end
 
-  desc 'Perform migration down (removes all tables)'
+  desc "Perform migration down (removes all tables)"
   task clean: :rom_configuration do
     ROM::SQL::RakeSupport.run_migrations(target: 0)
-    puts '<= db:clean executed'
+    puts "<= db:clean executed"
   end
 
-  desc 'Create a migration (parameters: NAME, VERSION)'
+  desc "Create a migration (parameters: NAME, VERSION)"
   task :create_migration, %i[name version] => :rom_configuration do |_, args|
     name, version = args.values_at(:name, :version)
 

data/lib/rom/sql/transaction.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rom/transaction"
+
 module ROM
   module SQL
     # @api private
@@ -8,12 +10,11 @@ module ROM
       private :connection
 
       def initialize(connection)
-        super()
         @connection = connection
       end
 
-      def run(opts = EMPTY_HASH)
-        connection.transaction(opts) { yield(self) }
+      def run(**options)
+        connection.transaction(options) { yield(self) }
       rescue ::ROM::Transaction::Rollback
         # noop
       end

data/lib/rom/sql/type_dsl.rb

@@ -6,11 +6,7 @@ module ROM
     #
     # @api public
     class TypeDSL
-      attr_reader :definition
-
-      attr_reader :input_constructor
-
-      attr_reader :output_constructor
+      attr_reader :definition, :input_constructor, :output_constructor
 
       # @api private
       def initialize(value_type)
@@ -22,8 +18,8 @@ module ROM
       end
 
       # @api private
-      def call(&)
-        instance_exec(&)
+      def call(&block)
+        instance_exec(&block)
 
         definition.constructor(input_constructor)
           .meta(read: definition.constructor(output_constructor))

data/lib/rom/sql/type_extensions.rb

@@ -30,13 +30,15 @@ module ROM
         # @param [Dry::Types::Type] type Type
         #
         # @api public
-        def register(type, &)
+        def register(type, &block)
           extensions = @types[type.meta[:database]]
           db_type = type.meta[:db_type]
 
-          mod = ::Module.new(&)
-          ctx = ::Object.new.extend(mod)
-          functions = mod.public_instance_methods.to_h { |m| [m, ctx.method(m)] }
+          mod = Module.new(&block)
+          ctx = Object.new.extend(mod)
+          functions = mod.public_instance_methods.each_with_object({}) { |m, ms|
+            ms[m] = ctx.method(m)
+          }
           extensions[db_type] = (extensions[db_type] || {}).merge(functions)
         end
       end

data/lib/rom/sql/type_serializer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/core/class_attributes'
+require "dry/core/class_attributes"
 
 module ROM
   module SQL
@@ -23,19 +23,19 @@ module ROM
       defines :mapping
 
       mapping(
-        Types::Integer => 'integer',
-        Types::String => 'varchar',
-        Types::Time => 'timestamp',
-        Types::Date => 'date',
-        Types::Bool => 'boolean',
-        Types::Decimal => 'numeric',
-        Types::Float => 'float'
+        Types::Integer => "integer",
+        Types::String => "varchar",
+        Types::Time => "timestamp",
+        Types::Date => "date",
+        Types::Bool => "boolean",
+        Types::Decimal => "numeric",
+        Types::Float => "float"
       )
 
       def call(type)
         return type.meta[:db_type] if type.meta[:db_type]
 
-        meta = type.meta[:read] ? { read: type.meta[:read] } : EMPTY_HASH
+        meta = type.meta[:read] ? {read: type.meta[:read]} : EMPTY_HASH
 
         self.class.mapping.fetch(type.with(meta: meta)) {
           if block_given?

data/lib/rom/sql/types.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'sequel/core'
-require 'sequel/sql'
+require "sequel/core"
+require "sequel/sql"
 
-require 'rom/types'
-require 'rom/sql/type_dsl'
+require "rom/types"
+require "rom/sql/type_dsl"
 
 module ROM
   module SQL
@@ -37,8 +37,8 @@ module ROM
       # @return [Dry::Types::Nominal]
       #
       # @api public
-      def self.define(value_type, &)
-        TypeDSL.new(value_type).call(&)
+      def self.define(value_type, &block)
+        TypeDSL.new(value_type).call(&block)
       end
 
       Serial = Integer.meta(primary_key: true)

data/lib/rom/sql/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module SQL
-    VERSION = '3.7.0'
+    VERSION = "4.0.0.alpha1"
   end
 end

data/lib/rom/sql/wrap.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/relation/wrap'
+require "rom/relation/wrap"
 
 module ROM
   module SQL

data/lib/rom/sql.rb

@@ -1,22 +1,23 @@
 # frozen_string_literal: true
 
-require 'rom/core'
+require "rom/core"
 
-require 'rom/sql/version'
-require 'rom/sql/errors'
+require "rom/sql/version"
+require "rom/sql/errors"
 
-require 'rom/configuration_dsl'
-
-require 'rom/sql/plugins'
-require 'rom/sql/relation'
-require 'rom/sql/mapper_compiler'
-require 'rom/sql/associations'
-require 'rom/sql/gateway'
-require 'rom/sql/migration'
-require 'rom/sql/extensions'
+require "rom/sql/plugins"
+require "rom/sql/relation"
+require "rom/sql/mapper_compiler"
+require "rom/sql/associations"
+require "rom/sql/gateway"
+require "rom/sql/migration"
+require "rom/sql/extensions"
 
 if defined?(Rails)
   ROM::SQL.load_extensions(:active_support_notifications, :rails_log_subscriber)
 end
 
 ROM.register_adapter(:sql, ROM::SQL)
+
+# Enable :default_view for all SQL relations
+ROM::SQL::Gateway.plugin(relations: :default_views)

data/lib/rom/types/values.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
-require 'rom/sql/types'
+require "rom/sql/types"
 
 module ROM
   module Types
     module Values
-      class TreePath < ::Struct.new(:value, :separator) # rubocop:disable Style/StructInheritance
+      class TreePath < ::Struct.new(:value, :separator)
+        DEFAULT_SEPARATOR = "."
+
         # @api public
-        def self.new(value, separator = '.')
+        def self.new(value, separator = DEFAULT_SEPARATOR)
           super
         end