rom-sql 3.0.1 → 3.3.2

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/types/values'
 
 module ROM
@@ -222,20 +224,20 @@ module ROM
         #
         #   end
         module LTreeMethods
-          ASCENDANT = ["(".freeze, " @> ".freeze, ")".freeze].freeze
-          FIND_ASCENDANT = ["(".freeze, " ?@> ".freeze, ")".freeze].freeze
-          DESCENDANT = ["(".freeze, " <@ ".freeze, ")".freeze].freeze
-          FIND_DESCENDANT = ["(".freeze, " ?<@ ".freeze, ")".freeze].freeze
-          MATCH_ANY = ["(".freeze, " ? ".freeze, ")".freeze].freeze
-          MATCH_ANY_LQUERY = ["(".freeze, " ?~ ".freeze, ")".freeze].freeze
-          MATCH_LTEXTQUERY = ["(".freeze, " @ ".freeze, ")".freeze].freeze
-          MATCH_ANY_LTEXTQUERY = ["(".freeze, " ?@ ".freeze, ")".freeze].freeze
+          ASCENDANT = ['(', ' @> ', ')'].freeze
+          FIND_ASCENDANT = ['(', ' ?@> ', ')'].freeze
+          DESCENDANT = ['(', ' <@ ', ')'].freeze
+          FIND_DESCENDANT = ['(', ' ?<@ ', ')'].freeze
+          MATCH_ANY = ['(', ' ? ', ')'].freeze
+          MATCH_ANY_LQUERY = ['(', ' ?~ ', ')'].freeze
+          MATCH_LTEXTQUERY = ['(', ' @ ', ')'].freeze
+          MATCH_ANY_LTEXTQUERY = ['(', ' ?@ ', ')'].freeze
 
-          def match(type, expr, query)
+          def match(_type, expr, query)
             Attribute[SQL::Types::Bool].meta(sql_expr: Sequel::SQL::BooleanExpression.new(:'~', expr, query))
           end
 
-          def match_any(type, expr, query)
+          def match_any(_type, expr, query)
             array = build_array_query(query)
             Attribute[SQL::Types::Bool].meta(sql_expr: custom_operator_expr(MATCH_ANY, expr, array))
           end
@@ -259,31 +261,31 @@ module ROM
         TypeExtensions.register(ROM::SQL::Types::PG::Array('ltree', LTree)) do
           include LTreeMethods
 
-          def contain_any_ltextquery(type, expr, query)
+          def contain_any_ltextquery(_type, expr, query)
             Attribute[SQL::Types::Bool].meta(sql_expr: custom_operator_expr(LTreeMethods::MATCH_LTEXTQUERY, expr, query))
           end
 
-          def contain_ancestor(type, expr, query)
+          def contain_ancestor(_type, expr, query)
             Attribute[SQL::Types::Bool].meta(sql_expr: custom_operator_expr(LTreeMethods::ASCENDANT, expr, query))
           end
 
-          def contain_descendant(type, expr, query)
+          def contain_descendant(_type, expr, query)
             Attribute[SQL::Types::Bool].meta(sql_expr: custom_operator_expr(LTreeMethods::DESCENDANT, expr, query))
           end
 
-          def find_ancestor(type, expr, query)
+          def find_ancestor(_type, expr, query)
             Attribute[LTree].meta(sql_expr: custom_operator_expr(LTreeMethods::FIND_ASCENDANT, expr, query))
           end
 
-          def find_descendant(type, expr, query)
+          def find_descendant(_type, expr, query)
             Attribute[LTree].meta(sql_expr: custom_operator_expr(LTreeMethods::FIND_DESCENDANT, expr, query))
           end
 
-          def match_any_lquery(type, expr, query)
+          def match_any_lquery(_type, expr, query)
             Attribute[LTree].meta(sql_expr: custom_operator_expr(LTreeMethods::MATCH_ANY_LQUERY, expr, query))
           end
 
-          def match_any_ltextquery(type, expr, query)
+          def match_any_ltextquery(_type, expr, query)
             Attribute[LTree].meta(sql_expr: custom_operator_expr(LTreeMethods::MATCH_ANY_LTEXTQUERY, expr, query))
           end
         end
@@ -291,29 +293,29 @@ module ROM
         TypeExtensions.register(LTree) do
           include LTreeMethods
 
-          def match_ltextquery(type, expr, query)
+          def match_ltextquery(_type, expr, query)
             Attribute[SQL::Types::Bool].meta(sql_expr: custom_operator_expr(LTreeMethods::MATCH_LTEXTQUERY, expr, query))
           end
 
-          def contain_descendant(type, expr, query)
+          def contain_descendant(_type, expr, query)
             array = build_array_query(query, 'ltree')
             Attribute[SQL::Types::Bool].meta(sql_expr: custom_operator_expr(LTreeMethods::DESCENDANT, expr, array))
           end
 
-          def descendant(type, expr, query)
+          def descendant(_type, expr, query)
             Attribute[SQL::Types::Bool].meta(sql_expr: custom_operator_expr(LTreeMethods::DESCENDANT, expr, query))
           end
 
-          def contain_ascendant(type, expr, query)
+          def contain_ascendant(_type, expr, query)
             array = build_array_query(query, 'ltree')
             Attribute[SQL::Types::Bool].meta(sql_expr: custom_operator_expr(LTreeMethods::ASCENDANT, expr, array))
           end
 
-          def ascendant(type, expr, query)
+          def ascendant(_type, expr, query)
             Attribute[SQL::Types::Bool].meta(sql_expr: custom_operator_expr(LTreeMethods::ASCENDANT, expr, query))
           end
 
-          def +(type, expr, other)
+          def +(_type, expr, other)
             other_value = case other
                           when ROM::Types::Values::TreePath
                             other

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ipaddr'
 
 module ROM

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sequel/core'
 
 Sequel.extension(:pg_range, :pg_range_ops)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/log_subscriber'
 
 module ROM

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     module SQLite

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry-types'
 
 module ROM

data/lib/rom/sql/foreign_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     # @api private
@@ -5,7 +7,7 @@ module ROM
       extend Initializer
       include Dry::Equalizer(:attributes, :parent_table, :options)
 
-      DEFAULT_PARENT_KEYS = %i(id).freeze
+      DEFAULT_PARENT_KEYS = %i[id].freeze
 
       param :attributes
 

data/lib/rom/sql/function.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'rom/attribute'
+require 'rom/sql/attribute_wrapping'
 
 module ROM
   module SQL
@@ -6,6 +9,8 @@ module ROM
     #
     # @api public
     class Function < ROM::Attribute
+      include AttributeWrapping
+
       class << self
         # @api private
         def frame_limit(value)
@@ -37,6 +42,19 @@ module ROM
       WINDOW_FRAMES[:rows] = WINDOW_FRAMES[rows: [:start, :current]]
       WINDOW_FRAMES[range: :current] = WINDOW_FRAMES[range: [:current, :current]]
 
+      # Return a new attribute with an alias
+      #
+      # @example
+      #   string::coalesce(users[:name], users[:id]).aliased(:display_name)
+      #
+      # @return [SQL::Function]
+      #
+      # @api public
+      def aliased(alias_name)
+        super.with(name: name || alias_name)
+      end
+      alias_method :as, :aliased
+
       # @api private
       def sql_literal(ds)
         if name
@@ -55,15 +73,29 @@ module ROM
       #
       # @api private
       def qualified(table_alias = nil)
-        meta(
-          func: ::Sequel::SQL::Function.new(func.name, *func.args.map { |arg| arg.respond_to?(:qualified) ? arg.qualified(table_alias) : arg })
-        )
+        new { |arg|
+          arg.respond_to?(:qualified) ? arg.qualified(table_alias) : arg
+        }
+      end
+
+      # @see Attribute#qualified_projection
+      #
+      # @api private
+      def qualified_projection(table_alias = nil)
+        new { |arg|
+          arg.respond_to?(:qualified_projection) ? arg.qualified_projection(table_alias) : arg
+        }
+      end
+
+      # @api private
+      def new(&block)
+        meta(func: ::Sequel::SQL::Function.new!(func.name, func.args.map(&block), func.opts))
       end
 
       # @see Attribute#qualified?
       #
       # @api private
-      def qualified?(table_alias = nil)
+      def qualified?(_table_alias = nil)
         meta[:func].args.all?(&:qualified?)
       end
 
@@ -168,7 +200,7 @@ module ROM
       #   users.project { integer::count(:id).filter(name.is("Jack")).as(:jacks) }.order(nil)
       #   users.project { integer::count(:id).filter { name.is("John") }).as(:johns) }.order(nil)
       #
-      # @param [Hash,SQL::Attribute] Conditions
+      # @param condition [Hash,SQL::Attribute] Conditions
       # @yield [block] A block with restrictions
       #
       # @return [SQL::Function]
@@ -193,7 +225,7 @@ module ROM
       # @example
       #   households.project { fload::percentile_cont(0.5).within_group(income).as(:percentile) }
       #
-      # @param [Array] A list of expressions for sorting within a group
+      # @param args [Array] A list of expressions for sorting within a group
       # @yield [block] A block for getting the expressions using the Order DSL
       #
       # @return [SQL::Function]

data/lib/rom/sql/gateway.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 require 'sequel/core'
 
@@ -21,7 +23,7 @@ module ROM
       adapter :sql
 
       CONNECTION_EXTENSIONS = {
-        postgres: %i(pg_array pg_json pg_enum)
+        postgres: %i[pg_array pg_json pg_enum]
       }.freeze
 
       # @!attribute [r] logger
@@ -79,6 +81,7 @@ module ROM
       def initialize(uri, options = EMPTY_HASH)
         @connection = connect(uri, options)
         load_extensions(Array(options[:extensions]))
+        Notifications.trigger("configuration.gateway.connected", connection: @connection)
 
         @options = options
 
@@ -234,6 +237,9 @@ 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'
+
+        # for ROM::SQL::Relation#nullify
+        connection.extension(:null_dataset)
       end
 
       # @api private
@@ -242,4 +248,6 @@ module ROM
       end
     end
   end
+
+  Configuration.register_event("configuration.gateway.connected")
 end

data/lib/rom/sql/group_dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/dsl'
 
 module ROM

data/lib/rom/sql/index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     # @api private

data/lib/rom/sql/join_dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/restriction_dsl'
 
 module ROM

data/lib/rom/sql/mapper_compiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/mapper_compiler'
 
 module ROM
@@ -7,11 +9,20 @@ module ROM
         name, _, meta_options = node
 
         if meta_options[:wrapped]
-          [name, from: meta_options[:alias]]
+          [extract_wrapped_name(node), from: meta_options[:alias]]
         else
           [name]
         end
       end
+
+      private
+
+      def extract_wrapped_name(node)
+        _, _, meta_options = node
+        unwrapped_name = meta_options[:alias].to_s.dup
+        unwrapped_name.slice!("#{meta_options[:wrapped]}_")
+        unwrapped_name.to_sym
+      end
     end
   end
 end

data/lib/rom/sql/migration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/migration/migrator'
 require 'rom/sql/migration/schema_diff'
 
@@ -97,7 +99,7 @@ module ROM
       attr_reader :migrator
 
       # @api private
-      def initialize(uri, options = EMPTY_HASH)
+      def initialize(_uri, options = EMPTY_HASH)
         @migrator = create_migrator(options[:migrator])
 
         self.class.instance ||= self
@@ -139,7 +141,7 @@ module ROM
       end
 
       # @api public
-      def auto_migrate!(conf, options = EMPTY_HASH, &block)
+      def auto_migrate!(conf, options = EMPTY_HASH)
         schemas = conf.relation_classes(self).map do |klass|
           klass.schema_proc.call.finalize_attributes!(gateway: self)
         end
@@ -156,7 +158,7 @@ module ROM
         return Migrator.new(connection) unless migrator_option
 
         if migrator_option.is_a?(Hash)
-          Migrator.new(connection, migrator_option)
+          Migrator.new(connection, **migrator_option)
         else
           migrator_option
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     module Migration

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 require 'rom/types'
@@ -65,12 +67,12 @@ module ROM
         end
 
         # @api private
-        def auto_migrate!(gateway, schemas, options = EMPTY_HASH, &block)
+        def auto_migrate!(gateway, schemas, options = EMPTY_HASH)
           diff_finder = SchemaDiff.new(gateway.database_type)
 
           changes = schemas.map { |target|
             empty = SQL::Schema.define(target.name)
-            current = target.with(inferrer.(empty, gateway))
+            current = target.with(**inferrer.(empty, gateway))
 
             diff_finder.(current, target)
           }.reject(&:empty?)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     module Migration

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     module Migration
@@ -67,8 +69,8 @@ module ROM
                   if attribute.type_changed?
                     from, to = attribute.current.unwrap, attribute.target.unwrap
                     raise UnsupportedConversion.new(
-                            "Don't know how to convert #{ from.inspect } to #{ to.inspect }"
-                          )
+                      "Don't know how to convert #{from.inspect} to #{to.inspect}"
+                    )
                   end
 
                   if attribute.nullability_changed?

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/type_serializer'
 
 module ROM

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ROM::SQL.migration do
   change do
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/migration/recorder'
 
 module ROM
@@ -32,7 +34,7 @@ module ROM
           operations.each do |operation|
             op, args, nested = operation
             buffer << indent << op.to_s << ' '
-            write_arguments(buffer, *args)
+            write_arguments(buffer, args)
 
             if !nested.empty?
               buffer << ' do'
@@ -42,9 +44,15 @@ module ROM
           end
         end
 
-        def write_arguments(buffer, *args, **kwargs)
+        def write_arguments(buffer, args)
+          if args.last.is_a?(::Hash)
+            args, options = args[0...-1], args.last
+          else
+            options = EMPTY_HASH
+          end
+
           buffer << args.map(&:inspect).join(', ')
-          kwargs.each do |key, value|
+          options.each do |key, value|
             buffer << ', ' << key.to_s << ': ' << value.inspect
           end
         end
@@ -53,7 +61,7 @@ module ROM
           create_or_alter, args = op
           table_name = args[0]
 
-          "#{ create_or_alter.to_s.sub('_table', '') }_#{ table_name }"
+          "#{create_or_alter.to_s.sub('_table', '')}_#{table_name}"
         end
       end
     end