rom-sql 3.7.0 → 4.0.0.alpha1

data/lib/rom/sql/attribute.rb

@@ -1,22 +1,20 @@
 # frozen_string_literal: true
 
-require 'sequel/core'
-require 'dry/core/cache'
+require "sequel/core"
+require "dry/core/cache"
 
-require 'rom/attribute'
+require "rom/attribute"
 
-require 'rom/sql/type_extensions'
-require 'rom/sql/projection_dsl'
-require 'rom/sql/attribute_wrapping'
-require 'rom/sql/attribute_aliasing'
+require "rom/sql/type_extensions"
+require "rom/sql/projection_dsl"
+require "rom/sql/attribute_wrapping"
+require "rom/sql/attribute_aliasing"
 
 module ROM
   module SQL
     # Extended schema attributes tailored for SQL databases
     #
     # @api public
-    #
-    # rubocop:disable Metrics/ClassLength
     class Attribute < ROM::Attribute
       include AttributeWrapping
       include AttributeAliasing
@@ -61,9 +59,7 @@ module ROM
         return meta(qualified: false) unless qualifiable?
 
         case sql_expr
-        when ::Sequel::SQL::AliasedExpression,
-             ::Sequel::SQL::Identifier,
-             ::Sequel::SQL::QualifiedIdentifier
+        when Sequel::SQL::AliasedExpression, Sequel::SQL::Identifier, Sequel::SQL::QualifiedIdentifier
           attr = meta(qualified: table_alias || true)
           attr.meta(sql_expr: attr.to_sql_name)
         else
@@ -267,8 +263,8 @@ module ROM
       # @return [SQL::Function]
       #
       # @api public
-      def func(&)
-        ProjectionDSL.new(name => self).call(&).first
+      def func(&block)
+        ProjectionDSL.new(name => self).call(&block).first
       end
 
       # Create a CONCAT function from the attribute
@@ -284,7 +280,7 @@ module ROM
       # @return [SQL::Function]
       #
       # @api public
-      def concat(other, sep = ' ')
+      def concat(other, sep = " ")
         Function.new(type).concat(self, sep, other)
       end
 
@@ -338,7 +334,7 @@ module ROM
       #
       # @api private
       def unwrap
-        cleaned_meta = meta.except(*META_KEYS)
+        cleaned_meta = meta.reject { |k, _| META_KEYS.include?(k) }
         type = optional? ? right : self.type
 
         self.class.new(type.with(meta: cleaned_meta), **options)
@@ -370,7 +366,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
 
         type = mapping.values[0].type
@@ -384,28 +380,19 @@ module ROM
       #
       # @api private
       def sql_expr
-        @sql_expr ||= meta[:sql_expr] || to_sql_name
-      end
-
-      # @api private
-      def respond_to_missing?(meth, _include_private = false)
-        if OPERATORS.include?(meth) || extensions.key?(meth) || sql_expr.respond_to?(meth)
-          true
-        else
-          super
-        end
+        @sql_expr ||= (meta[:sql_expr] || to_sql_name)
       end
 
       # Delegate to sql expression if it responds to a given method
       #
       # @api private
-      def method_missing(meth, *args, &)
+      def method_missing(meth, *args, &block)
         if OPERATORS.include?(meth)
           __cmp__(meth, args[0])
         elsif extensions.key?(meth)
-          extensions[meth].(type, sql_expr, *args, &)
+          extensions[meth].(type, sql_expr, *args, &block)
         elsif sql_expr.respond_to?(meth)
-          meta(sql_expr: sql_expr.__send__(meth, *args, &))
+          meta(sql_expr: sql_expr.__send__(meth, *args, &block))
         else
           super
         end
@@ -449,6 +436,5 @@ module ROM
 
       memoize :joined, :to_sql_name, :table_name, :canonical
     end
-    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/rom/sql/attribute_aliasing.rb

@@ -45,7 +45,7 @@ module ROM
       #
       # @api private
       def aliased_projection?
-        meta[:sql_expr].is_a?(::Sequel::SQL::AliasedExpression)
+        meta[:sql_expr].is_a?(Sequel::SQL::AliasedExpression)
       end
 
       private
@@ -53,10 +53,8 @@ module ROM
       # @api private
       def alias_sql_expr(sql_expr, new_alias)
         case sql_expr
-        when ::Sequel::SQL::AliasedExpression
-          ::Sequel::SQL::AliasedExpression.new(
-            sql_expr.expression, new_alias, sql_expr.columns
-          )
+        when Sequel::SQL::AliasedExpression
+          Sequel::SQL::AliasedExpression.new(sql_expr.expression, new_alias, sql_expr.columns)
         else
           sql_expr.as(new_alias)
         end
@@ -71,7 +69,7 @@ module ROM
           # attribute in a way that will map the the requested alias name.
           # Without this, the attribute will silently ignore the requested alias
           # name and default to the pre-existing name.
-          new_name = :"#{meta[:wrapped]}_#{options[:alias]}"
+          new_name = "#{meta[:wrapped]}_#{options[:alias]}".to_sym
 
           # Essentially, this makes it so "wrapped" attributes aren't true
           # aliases, in that we actually alias the wrapped attribute, we use

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/sql/commands/error_wrapper'
+require "rom/sql/commands/error_wrapper"
 
 module ROM
   module SQL
@@ -9,7 +9,7 @@ module ROM
       #
       # @api public
       class Create < ROM::Commands::Create
-        adapter :sql
+        config.component.adapter = :sql
 
         include ErrorWrapper
 
@@ -60,11 +60,11 @@ module ROM
         # Yields tuples for insertion or return an enumerator
         #
         # @api private
-        def with_input_tuples(tuples, &)
-          input_tuples = [tuples].flatten(1).map
+        def with_input_tuples(tuples, &block)
+          input_tuples = Array([tuples]).flatten(1).map
           return input_tuples unless block_given?
 
-          input_tuples.each(&)
+          input_tuples.each(&block)
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/sql/commands/error_wrapper'
+require "rom/sql/commands/error_wrapper"
 
 module ROM
   module SQL
@@ -9,7 +9,7 @@ module ROM
       #
       # @api public
       class Delete < ROM::Commands::Delete
-        adapter :sql
+        config.component.adapter = :sql
 
         include ErrorWrapper
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/sql/commands/error_wrapper'
+require "rom/sql/commands/error_wrapper"
 
 module ROM
   module SQL
@@ -9,7 +9,7 @@ module ROM
       #
       # @api public
       class Update < ROM::Commands::Update
-        adapter :sql
+        config.component.adapter = :sql
 
         include ErrorWrapper
 
@@ -52,11 +52,11 @@ module ROM
         # Yields tuples for insertion or return an enumerator
         #
         # @api private
-        def with_input_tuples(tuples, &)
-          input_tuples = [tuples].flatten(1).map
+        def with_input_tuples(tuples, &block)
+          input_tuples = Array([tuples]).flatten(1).map
           return input_tuples unless block_given?
 
-          input_tuples.each(&)
+          input_tuples.each(&block)
         end
       end
     end

data/lib/rom/sql/commands.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'rom/commands'
+require "rom/commands"
 
-require 'rom/sql/commands/create'
-require 'rom/sql/commands/update'
-require 'rom/sql/commands/delete'
+require "rom/sql/commands/create"
+require "rom/sql/commands/update"
+require "rom/sql/commands/delete"

data/lib/rom/sql/dsl.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-require 'rom/support/inflector'
-require 'rom/constants'
+require "concurrent/map"
+require "rom/support/inflector"
+require "rom/constants"
 
 module ROM
   module SQL
@@ -59,9 +59,7 @@ module ROM
       #
       # @example
       #   users.where { exists(users.where(name: 'John')) }
-      #   users.select_append { |r|
-      #     exists(r[:posts].where(r[:posts][:user_id] => id)).as(:has_posts)
-      #   }
+      #   users.select_append { |r| exists(r[:posts].where(r[:posts][:user_id] => id)).as(:has_posts) }
       #
       # @api public
       def exists(relation)

data/lib/rom/sql/errors.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'sequel/deprecated'
-require 'sequel/exceptions'
+require "sequel/deprecated"
+require "sequel/exceptions"
 
-require 'rom/sql/error'
+require "rom/sql/error"
 
 module ROM
   module SQL

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'sequel/database/logging'
-require 'active_support/notifications'
+require "sequel/database/logging"
+require "active_support/notifications"
 
 module ROM
   module SQL
     module ActiveSupportInstrumentation
       def log_connection_yield(sql, _conn, args = nil)
         ActiveSupport::Notifications.instrument(
-          'sql.rom',
+          "sql.rom",
           sql: sql,
           name: instrumentation_name,
           binds: args

data/lib/rom/sql/extensions/mysql/type_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/sql/schema/attributes_inferrer'
+require "rom/sql/schema/attributes_inferrer"
 
 module ROM
   module SQL
@@ -9,10 +9,10 @@ module ROM
         defines :db_type_mapping
 
         db_type_mapping(
-          'tinytext' => Types::String,
-          'text' => Types::String,
-          'mediumtext' => Types::String,
-          'longtext' => Types::String
+          "tinytext" => Types::String,
+          "text" => Types::String,
+          "mediumtext" => Types::String,
+          "longtext" => Types::String
         ).freeze
 
         def map_type(ruby_type, db_type, **_)

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

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'rom/sql/extensions/mysql/type_builder'
+require "rom/sql/extensions/mysql/type_builder"

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'rom/sql/commands/create'
-require 'rom/sql/commands/update'
+require "rom/sql/commands/create"
+require "rom/sql/commands/update"
 
 module ROM
   module SQL
@@ -83,29 +83,33 @@ module ROM
         #
         # @api public
         class Upsert < SQL::Commands::Create
-          adapter :sql
+          config.component.adapter = :sql
 
-          defines :constraint, :conflict_target, :conflict_where, :update_statement, :update_where
+          setting :constraint
+          setting :conflict_target
+          setting :conflict_where
+          setting :update_statement
+          setting :update_where
 
           # @!attribute [r] constraint
           #  @return [Symbol] the name of the constraint expected to be violated
-          option :constraint, default: -> { self.class.constraint }
+          option :constraint, default: -> { config.constraint }
 
           # @!attribute [r] conflict_target
           #  @return [Object] the column or expression to handle a violation on
-          option :conflict_target, default: -> { self.class.conflict_target }
+          option :conflict_target, default: -> { config.conflict_target }
 
           # @!attribute [r] conflict_where
           #  @return [Object] the index filter, when using a partial index to determine uniqueness
-          option :conflict_where, default: -> { self.class.conflict_where }
+          option :conflict_where, default: -> { config.conflict_where }
 
           # @!attribute [r] update_statement
           #  @return [Object] the update statement which will be executed in case of a violation
-          option :update_statement, default: -> { self.class.update_statement }
+          option :update_statement, default: -> { config.update_statement }
 
           # @!attribute [r] update_where
           #  @return [Object] the WHERE clause to be added to the update
-          option :update_where, default: -> { self.class.update_where }
+          option :update_where, default: -> { config.update_where }
 
           # Tries to insert provided tuples and do an update (or nothing)
           # when the inserted record violates a unique constraint and hence
@@ -137,27 +141,5 @@ module ROM
     end
 
     Commands::Postgres = Postgres::Commands
-
-    Gateway.subscribe('configuration.commands.class.before_build') do |event|
-      klass = event[:command]
-
-      # TODO: remove this conditional in favor of `adapter: :sql` in subscribe
-      #       this is here for backward compatibilty with rom-core 4.x
-      if klass.adapter == :sql
-        dataset = event[:dataset]
-        type = dataset.db.database_type
-
-        if type == :postgres
-          ext =
-            if klass < Commands::Create
-              Postgres::Commands::Create
-            elsif klass < Commands::Update
-              Postgres::Commands::Update
-            end
-
-          klass.include(ext) if ext
-        end
-      end
-    end
   end
 end

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

@@ -6,40 +6,37 @@ module ROM
       class TypeBuilder < Schema::TypeBuilder
         defines :db_numeric_types, :db_type_mapping, :db_array_type_matcher
 
-        db_numeric_types [
-          'smallint', 'integer', 'bigint',
-          'decimal', 'numeric', 'real',
-          'double precision', 'serial', 'bigserial'
-        ].to_set.freeze
+        db_numeric_types ["smallint", "integer", "bigint", "decimal", "numeric", "real",
+                          "double precision", "serial", "bigserial"].to_set.freeze
 
         db_type_mapping(
-          'uuid' => Types::UUID,
-          'money' => Types::Money,
-          'bytea' => Types::Bytea,
-          'json' => Types::JSON,
-          'jsonb' => Types::JSONB,
-          'xml' => Types::XML,
-          'inet' => Types::IPAddress,
-          'cidr' => Types::IPNetwork,
-          'macaddr' => SQL::Types::String,
-          'point' => Types::Point,
-          'hstore' => Types::HStore,
-          'line' => Types::Line,
-          'circle' => Types::Circle,
-          'box' => Types::Box,
-          'lseg' => Types::LineSegment,
-          'polygon' => Types::Polygon,
-          'path' => Types::Path,
-          'int4range' => Types::Int4Range,
-          'int8range' => Types::Int8Range,
-          'numrange' => Types::NumRange,
-          'tsrange' => Types::TsRange,
-          'tstzrange' => Types::TsTzRange,
-          'daterange' => Types::DateRange,
-          'ltree' => Types::LTree
+          "uuid" => Types::UUID,
+          "money" => Types::Money,
+          "bytea" => Types::Bytea,
+          "json" => Types::JSON,
+          "jsonb" => Types::JSONB,
+          "xml" => Types::XML,
+          "inet" => Types::IPAddress,
+          "cidr" => Types::IPAddress,
+          "macaddr" => SQL::Types::String,
+          "point" => Types::Point,
+          "hstore" => Types::HStore,
+          "line" => Types::Line,
+          "circle" => Types::Circle,
+          "box" => Types::Box,
+          "lseg" => Types::LineSegment,
+          "polygon" => Types::Polygon,
+          "path" => Types::Path,
+          "int4range" => Types::Int4Range,
+          "int8range" => Types::Int8Range,
+          "numrange" => Types::NumRange,
+          "tsrange" => Types::TsRange,
+          "tstzrange" => Types::TsTzRange,
+          "daterange" => Types::DateRange,
+          "ltree" => Types::LTree
         ).freeze
 
-        db_array_type_matcher '[]'
+        db_array_type_matcher "[]"
 
         def map_pk_type(type, db_type, **options)
           if numeric?(type, db_type)
@@ -66,7 +63,7 @@ module ROM
 
         def map_db_type(db_type)
           self.class.db_type_mapping[db_type] ||
-            (db_type.start_with?('timestamp') ? SQL::Types::Time : nil)
+            (db_type.start_with?("timestamp") ? SQL::Types::Time : nil)
         end
 
         def numeric?(ruby_type, db_type)

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

@@ -7,36 +7,35 @@ module ROM
       class TypeSerializer < ROM::SQL::TypeSerializer
         mapping(
           mapping.merge(
-            SQL::Types::String => 'text',
-            Types::UUID => 'uuid',
-            Types::XML => 'xml',
-            Types::Money => 'money',
-            Types::Bytea => 'bytea',
-            Types::JSON => 'json',
-            Types::JSONB => 'jsonb',
-            Types::HStore => 'hstore',
-            Types::IPAddress => 'inet',
-            Types::IPNetwork => 'cidr',
-            Types::Point => 'point',
-            Types::Line => 'line',
-            Types::Circle => 'circle',
-            Types::Box => 'box',
-            Types::LineSegment => 'lseg',
-            Types::Polygon => 'polygon',
-            Types::Path => 'path',
-            Types::Int4Range => 'int4range',
-            Types::Int8Range => 'int8range',
-            Types::NumRange => 'numrange',
-            Types::TsRange => 'tsrange',
-            Types::TsTzRange => 'tstzrange',
-            Types::DateRange => 'daterange',
-            Types::LTree => 'ltree'
+            SQL::Types::String => "text",
+            Types::UUID => "uuid",
+            Types::XML => "xml",
+            Types::Money => "money",
+            Types::Bytea => "bytea",
+            Types::JSON => "json",
+            Types::JSONB => "jsonb",
+            Types::HStore => "hstore",
+            Types::IPAddress => "inet",
+            Types::Point => "point",
+            Types::Line => "line",
+            Types::Circle => "circle",
+            Types::Box => "box",
+            Types::LineSegment => "lseg",
+            Types::Polygon => "polygon",
+            Types::Path => "path",
+            Types::Int4Range => "int4range",
+            Types::Int8Range => "int8range",
+            Types::NumRange => "numrange",
+            Types::TsRange => "tsrange",
+            Types::TsTzRange => "tstzrange",
+            Types::DateRange => "daterange",
+            Types::LTree => "ltree"
           )
         )
 
         def call(type)
           super do
-            if type.respond_to?(:primitive) && type.primitive.equal?(::Array)
+            if type.respond_to?(:primitive) && type.primitive.equal?(Array)
               "#{type.meta[:type]}[]"
             end
           end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'sequel/core'
+require "sequel/core"
 
 Sequel.extension(:pg_array, :pg_array_ops)
 
-require 'rom/sql/extensions/postgres/types/array_types'
+require "rom/sql/extensions/postgres/types/array_types"
 
 module ROM
   module SQL
@@ -123,7 +123,7 @@ module ROM
           end
 
           def any(_type, expr, value)
-            Attribute[SQL::Types::Bool].meta(sql_expr: { value => expr.pg_array.any })
+            Attribute[SQL::Types::Bool].meta(sql_expr: {value => expr.pg_array.any})
           end
 
           def contained_by(type, expr, other)
@@ -142,7 +142,7 @@ module ROM
             Attribute[type].meta(sql_expr: expr.pg_array.remove(cast(type, value)))
           end
 
-          def join(_type, expr, delimiter = '', null = nil)
+          def join(_type, expr, delimiter = "", null = nil)
             Attribute[SQL::Types::String].meta(sql_expr: expr.pg_array.join(delimiter, null))
           end
 

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

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