rom-sql 3.7.0 → 4.0.0.alpha1

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'sequel/core'
+require "sequel/core"
 
-require 'rom/sql/type_extensions'
+require "rom/sql/type_extensions"
 
 Sequel.extension(:pg_hstore)
 
@@ -11,25 +11,25 @@ module ROM
     module Postgres
       module Types
         def self.Type(name, type = yield)
-          type.meta(db_type: name, database: 'postgres')
+          type.meta(db_type: name, database: "postgres")
         end
 
-        UUID = Type('uuid', SQL::Types::String)
+        UUID = Type("uuid", SQL::Types::String)
 
-        HStore = Type('hstore') do
+        HStore = Type("hstore") do
           read = SQL::Types.Constructor(Hash, &:to_hash)
 
           SQL::Types.Constructor(Hash, &Sequel.method(:hstore))
             .meta(read: read)
         end
 
-        Bytea = Type('bytea') do
+        Bytea = Type("bytea") do
           SQL::Types.Constructor(Sequel::SQL::Blob, &Sequel::SQL::Blob.method(:new))
         end
 
-        Money = Type('money', SQL::Types::Decimal)
+        Money = Type("money", SQL::Types::Decimal)
 
-        XML = Type('xml', SQL::Types::String)
+        XML = Type("xml", SQL::Types::String)
       end
     end
 
@@ -39,9 +39,9 @@ module ROM
   end
 end
 
-require 'rom/sql/extensions/postgres/types/array'
-require 'rom/sql/extensions/postgres/types/json'
-require 'rom/sql/extensions/postgres/types/geometric'
-require 'rom/sql/extensions/postgres/types/network'
-require 'rom/sql/extensions/postgres/types/range'
-require 'rom/sql/extensions/postgres/types/ltree'
+require "rom/sql/extensions/postgres/types/array"
+require "rom/sql/extensions/postgres/types/json"
+require "rom/sql/extensions/postgres/types/geometric"
+require "rom/sql/extensions/postgres/types/network"
+require "rom/sql/extensions/postgres/types/range"
+require "rom/sql/extensions/postgres/types/ltree"

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'rom/sql/extensions/postgres/commands'
-require 'rom/sql/extensions/postgres/types'
-require 'rom/sql/extensions/postgres/type_builder'
-require 'rom/sql/extensions/postgres/type_serializer'
-require 'rom/plugins/relation/sql/postgres/explain'
-require 'rom/plugins/relation/sql/postgres/full_text_search'
+require "rom/sql/extensions/postgres/commands"
+require "rom/sql/extensions/postgres/types"
+require "rom/sql/extensions/postgres/type_builder"
+require "rom/sql/extensions/postgres/type_serializer"
+require "rom/plugins/relation/sql/postgres/explain"
+require "rom/plugins/relation/sql/postgres/full_text_search"

data/lib/rom/sql/extensions/rails_log_subscriber.rb

@@ -1,39 +1,24 @@
 # frozen_string_literal: true
 
-require 'active_support/log_subscriber'
+require "active_support/log_subscriber"
 
 module ROM
   module SQL
     class RailsLogSubscriber < ActiveSupport::LogSubscriber
-      as_version =
-        begin
-          require 'active_support/gem_version'
-          ActiveSupport.gem_version
-        rescue LoadError
-          nil
-        end
-
-      COLOR_OPTION =
-        if as_version && as_version >= ::Gem::Version.new('7.2')
-          { color: true }
-        else
-          true
-        end
-
       def sql(event)
         return unless logger.debug?
 
         payload = event.payload
 
-        name = format('%<name>s (%<duration>.1fms)', name: payload[:name], duration: event.duration)
-        sql  = payload[:sql].squeeze(' ')
+        name = format("%s (%.1fms)", payload[:name], event.duration)
+        sql  = payload[:sql].squeeze(" ")
         binds = payload[:binds].to_a.inspect if payload[:binds]
 
         if odd?
-          name = color(name, :cyan, COLOR_OPTION)
-          sql  = color(sql, nil, COLOR_OPTION)
+          name = color(name, :cyan, true)
+          sql  = color(sql, nil, true)
         else
-          name = color(name, :magenta, COLOR_OPTION)
+          name = color(name, :magenta, true)
         end
 
         debug "  #{name}  #{sql}  #{binds}"

data/lib/rom/sql/extensions/sqlite/types.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry-types'
+require "dry-types"
 
 module ROM
   module SQL

data/lib/rom/sql/extensions/sqlite.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-require 'rom/sql/extensions/sqlite/types'
-require 'rom/sql/extensions/sqlite/type_builder'
+require "rom/sql/extensions/sqlite/types"
+require "rom/sql/extensions/sqlite/type_builder"

data/lib/rom/sql/extensions.rb

@@ -1,29 +1,29 @@
 # frozen_string_literal: true
 
-require 'dry/core/extensions'
+require "dry/core/extensions"
 
 module ROM
   module SQL
     extend Dry::Core::Extensions
 
     register_extension(:postgres) do
-      require 'rom/sql/extensions/postgres'
+      require "rom/sql/extensions/postgres"
     end
 
     register_extension(:mysql) do
-      require 'rom/sql/extensions/mysql'
+      require "rom/sql/extensions/mysql"
     end
 
     register_extension(:sqlite) do
-      require 'rom/sql/extensions/sqlite'
+      require "rom/sql/extensions/sqlite"
     end
 
     register_extension(:active_support_notifications) do
-      require 'rom/sql/extensions/active_support_notifications'
+      require "rom/sql/extensions/active_support_notifications"
     end
 
     register_extension(:rails_log_subscriber) do
-      require 'rom/sql/extensions/rails_log_subscriber'
+      require "rom/sql/extensions/rails_log_subscriber"
     end
   end
 end

data/lib/rom/sql/foreign_key.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "dry/core/equalizer"
+
 module ROM
   module SQL
     # @api private
@@ -11,7 +13,7 @@ module ROM
 
       param :attributes
 
-      param :parent_table, type: Dry::Types['strict.symbol']
+      param :parent_table, type: Dry::Types["strict.symbol"]
 
       option :parent_keys, default: -> { DEFAULT_PARENT_KEYS }
     end

data/lib/rom/sql/function.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'rom/attribute'
-require 'rom/sql/attribute_wrapping'
+require "rom/attribute"
+require "rom/sql/attribute_wrapping"
 
 module ROM
   module SQL
@@ -15,9 +15,9 @@ module ROM
         # @api private
         def frame_limit(value)
           case value
-          when :current then 'CURRENT ROW'
-          when :start then 'UNBOUNDED PRECEDING'
-          when :end then 'UNBOUNDED FOLLOWING'
+          when :current then "CURRENT ROW"
+          when :start then "UNBOUNDED PRECEDING"
+          when :end then "UNBOUNDED FOLLOWING"
           else
             if value.positive?
               "#{value} FOLLOWING"
@@ -32,7 +32,7 @@ module ROM
 
       # @api private
       WINDOW_FRAMES = Hash.new do |cache, frame|
-        type = frame.key?(:rows) ? 'ROWS' : 'RANGE'
+        type = frame.key?(:rows) ? "ROWS" : "RANGE"
         bounds = frame[:rows] || frame[:range]
         cache[frame] =
           "#{type} BETWEEN #{frame_limit(bounds[0])} AND #{frame_limit(bounds[1])}"
@@ -41,7 +41,7 @@ module ROM
       WINDOW_FRAMES[nil] = nil
       WINDOW_FRAMES[:all] = WINDOW_FRAMES[rows: %i[start end]]
       WINDOW_FRAMES[:rows] = WINDOW_FRAMES[rows: %i[start current]]
-      WINDOW_FRAMES[{ range: :current }] = WINDOW_FRAMES[range: %i[current current]]
+      WINDOW_FRAMES[range: :current] = WINDOW_FRAMES[range: %i[current current]]
 
       # Return a new attribute with an alias
       #
@@ -89,13 +89,8 @@ module ROM
       end
 
       # @api private
-      def new(&)
-        case func
-        when ::Sequel::SQL::Function
-          meta(func: ::Sequel::SQL::Function.new!(func.name, func.args.map(&), func.opts))
-        else
-          meta(func: func)
-        end
+      def new(&block)
+        meta(func: ::Sequel::SQL::Function.new!(func.name, func.args.map(&block), func.opts))
       end
 
       # @see Attribute#qualified?
@@ -110,7 +105,7 @@ module ROM
       # @api public
       def is(other)
         ::ROM::SQL::Attribute[::ROM::SQL::Types::Bool].meta(
-          sql_expr: ::Sequel::SQL::BooleanExpression.new(:'=', func, other)
+          sql_expr: ::Sequel::SQL::BooleanExpression.new(:"=", func, other)
         )
       end
 
@@ -126,15 +121,7 @@ module ROM
       #
       # @example
       #   users.select { [id, integer::row_number().over(partition: name, order: id).as(:row_no)] }
-      #   users.select {
-      #     [
-      #       id,
-      #       integer::row_number().over(
-      #         partition: [first_name, last_name],
-      #         order: id
-      #       ).as(:row_no)
-      #     ]
-      #   }
+      #   users.select { [id, integer::row_number().over(partition: [first_name, last_name], order: id).as(:row_no)] }
       #
       # @example frame variants
       #   # ROWS BETWEEN 3 PRECEDING AND CURRENT ROW
@@ -176,8 +163,7 @@ module ROM
       #   users.select { bool::cast(json_data.get_text('activated')).as(:activated) }
       #
       # @param [ROM::SQL::Attribute] expr Expression to be cast
-      # @param [String] db_type
-      #        Target database type (usually can be inferred from the target data type)
+      # @param [String] db_type Target database type (usually can be inferred from the target data type)
       #
       # @return [ROM::SQL::Attribute]
       #
@@ -200,7 +186,7 @@ module ROM
       def case(mapping)
         mapping = mapping.dup
         otherwise = mapping.delete(:else) do
-          raise ArgumentError, 'provide the default case using the :else keyword'
+          raise ArgumentError, "provide the default case using the :else keyword"
         end
 
         Attribute[type].meta(sql_expr: ::Sequel.case(mapping, otherwise))
@@ -221,9 +207,9 @@ module ROM
       # @return [SQL::Function]
       #
       # @api public
-      def filter(condition = Undefined, &)
-        if block_given?
-          conditions = schema.restriction(&)
+      def filter(condition = Undefined, &block)
+        if block
+          conditions = schema.restriction(&block)
           conditions &= condition unless condition.equal?(Undefined)
         else
           conditions = condition
@@ -246,9 +232,9 @@ module ROM
       # @return [SQL::Function]
       #
       # @api public
-      def within_group(*args, &)
-        if block_given?
-          group = args + ::ROM::SQL::OrderDSL.new(schema).(&)
+      def within_group(*args, &block)
+        if block
+          group = args + ::ROM::SQL::OrderDSL.new(schema).(&block)
         else
           group = args
         end
@@ -268,15 +254,6 @@ module ROM
         meta[:func]
       end
 
-      # @api private
-      def respond_to_missing?(meth, _include_private = false)
-        if func
-          func.respond_to?(meth) || super
-        else
-          true
-        end
-      end
-
       # @api private
       def method_missing(meth, *args)
         if func

data/lib/rom/sql/gateway.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-require 'logger'
-require 'sequel/core'
+require "logger"
+require "sequel/core"
 
-require 'dry/core/constants'
+require "dry/core/constants"
 
-require 'rom/types'
-require 'rom/gateway'
-require 'rom/sql/migration'
-require 'rom/sql/commands'
-require 'rom/sql/transaction'
+require "rom/setup"
+require "rom/types"
+require "rom/gateway"
+require "rom/sql/migration"
+require "rom/sql/commands"
+require "rom/sql/transaction"
+require "rom/support/notifications"
 
 module ROM
   module SQL
@@ -17,6 +19,8 @@ module ROM
     #
     # @api public
     class Gateway < ROM::Gateway
+      extend Notifications
+
       include Dry::Core::Constants
       include Migration
 
@@ -75,20 +79,24 @@ module ROM
       #
       # @return [SQL::Gateway]
       #
-      # @see https://github.com/jeremyevans/sequel/blob/master/doc/opening_databases.rdoc
-      #      Sequel connection docs
+      # @see https://github.com/jeremyevans/sequel/blob/master/doc/opening_databases.rdoc Sequel connection docs
       #
       # @api public
       def initialize(uri, options = EMPTY_HASH)
         @connection = connect(uri, options)
         load_extensions(Array(options[:extensions]))
-        Notifications.trigger('configuration.gateway.connected', connection: @connection)
+        notifications.trigger("sql.gateway.connected", connection: @connection)
 
         @options = options
 
         super
       end
 
+      # @api private
+      def notifications
+        @notifications ||= Notifications.event_bus(:sql)
+      end
+
       # Disconnect from the gateway's database
       #
       # @api public
@@ -206,6 +214,26 @@ module ROM
         connection.run(statement)
       end
 
+      # Build an SQL-specific command
+      #
+      # @return [Command]
+      #
+      # @api public
+      def command(klass, relation:, **opts)
+        return super unless relation.dataset.db.database_type == :postgres
+
+        ext =
+          if klass < Commands::Create
+            Postgres::Commands::Create
+          elsif klass < Commands::Update
+            Postgres::Commands::Update
+          end
+
+        klass.include(ext) if ext
+
+        super
+      end
+
       private
 
       # Connect to database or reuse established connection instance
@@ -237,18 +265,16 @@ module ROM
 
         # this will be default in Sequel 5.0.0 and since we don't rely
         # on dataset mutation it is safe to enable it already
-        connection.extension(:freeze_datasets) unless RUBY_ENGINE == 'rbx'
+        connection.extension(:freeze_datasets) unless RUBY_ENGINE == "rbx"
 
         # for ROM::SQL::Relation#nullify
         connection.extension(:null_dataset)
       end
 
       # @api private
-      def transaction_runner(_)
+      def transaction_runner(**)
         ROM::SQL::Transaction.new(connection)
       end
     end
   end
-
-  Configuration.register_event('configuration.gateway.connected')
 end

data/lib/rom/sql/group_dsl.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/sql/dsl'
+require "rom/sql/dsl"
 
 module ROM
   module SQL
@@ -9,16 +9,11 @@ module ROM
       private
 
       # @api 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].canonical
         else
-          ::Sequel::VIRTUAL_ROW.__send__(meth.to_s, ...)
+          ::Sequel::VIRTUAL_ROW.__send__(meth.to_s, *args, &block)
         end
       end
     end

data/lib/rom/sql/index.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "dry/core/equalizer"
+
 module ROM
   module SQL
     # @api private

data/lib/rom/sql/join_dsl.rb

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

data/lib/rom/sql/mapper_compiler.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/mapper_compiler'
+require "rom/mapper_compiler"
 
 module ROM
   module SQL
@@ -9,7 +9,7 @@ module ROM
         name, _, meta_options = node
 
         if meta_options[:wrapped]
-          [extract_wrapped_name(node), from: meta_options[:alias]]
+          [extract_wrapped_name(node), {from: meta_options[:alias]}]
         else
           [name]
         end

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

@@ -13,14 +13,8 @@ module ROM
           yield(connection)
         end
 
-        private
-
-        def method_missing(m, ...)
-          connection.public_send(m, ...)
-        end
-
-        def respond_to_missing?(meth, include_private = false)
-          connection.respond_to?(meth, include_private)
+        def method_missing(m, *args, &block)
+          connection.public_send(m, *args, &block)
         end
       end
     end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'pathname'
+require "pathname"
 
-require 'rom/types'
-require 'rom/initializer'
+require "rom/types"
+require "rom/initializer"
 
-require 'rom/sql/migration/runner'
-require 'rom/sql/migration/inline_runner'
-require 'rom/sql/migration/writer'
+require "rom/sql/migration/runner"
+require "rom/sql/migration/inline_runner"
+require "rom/sql/migration/writer"
 
 module ROM
   module SQL
@@ -16,8 +16,8 @@ module ROM
       class Migrator
         extend Initializer
 
-        DEFAULT_PATH = 'db/migrate'
-        VERSION_FORMAT = '%Y%m%d%H%M%S'
+        DEFAULT_PATH = "db/migrate"
+        VERSION_FORMAT = "%Y%m%d%H%M%S"
         DEFAULT_INFERRER = Schema::Inferrer.new.suppress_errors.freeze
 
         param :connection
@@ -37,13 +37,13 @@ module ROM
         end
 
         # @api private
-        def migration(&)
-          Sequel.migration(&)
+        def migration(&block)
+          Sequel.migration(&block)
         end
 
         # @api private
         def create_file(name, version = generate_version, **options)
-          sequence = options[:sequence] ? '%03d' % options[:sequence] : nil
+          sequence = options[:sequence] ? "%03d" % options[:sequence] : nil
           filename = "#{version}#{sequence}_#{name}.rb"
           content = options[:content] || migration_file_content
           path = options[:path] || self.path
@@ -63,7 +63,7 @@ module ROM
 
         # @api private
         def migration_file_content
-          File.read(Pathname(__FILE__).dirname.join('template.rb').realpath)
+          File.read(Pathname(__FILE__).dirname.join("template.rb").realpath)
         end
 
         # @api private

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

@@ -7,20 +7,14 @@ module ROM
       class Recorder
         attr_reader :operations
 
-        def initialize(&)
+        def initialize(&block)
           @operations = []
 
-          instance_exec(&) if block_given?
+          instance_exec(&block) if block
         end
 
-        private
-
-        def respond_to_missing?(_m, _include_private = false)
-          true
-        end
-
-        def method_missing(m, *args, &)
-          nested = block_given? ? Recorder.new(&).operations : EMPTY_ARRAY
+        def method_missing(m, *args, &block)
+          nested = block ? Recorder.new(&block).operations : EMPTY_ARRAY
           @operations << [m, args, nested]
         end
       end

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

@@ -13,7 +13,7 @@ module ROM
 
         def call(changes)
           changes.each { |diff| apply_schema(diff) }
-          changes.each { |diff| apply_constraints(diff) } # rubocop:disable Style/CombinableLoops
+          changes.each { |diff| apply_constraints(diff) }
 
           self
         end
@@ -54,7 +54,7 @@ module ROM
           end
         end
 
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable Metrics/AbcSize
         def alter_table(diff)
           return if diff.meta?
 
@@ -69,8 +69,7 @@ module ROM
                 when SchemaDiff::AttributeChanged
                   if attribute.type_changed?
                     from, to = attribute.current.unwrap, attribute.target.unwrap
-                    raise UnsupportedConversion,
-                          "Don't know how to convert #{from.inspect} to #{to.inspect}"
+                    raise UnsupportedConversion, "Don't know how to convert #{from.inspect} to #{to.inspect}"
                   end
 
                   if attribute.nullability_changed?
@@ -94,7 +93,7 @@ module ROM
             end
           end
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/AbcSize
 
         def alter_foreign_keys(diff, foreign_key_changes)
           return if foreign_key_changes.empty?