rom-sql 3.1.0 → 3.3.3

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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/attribute'
 require 'rom/sql/attribute_wrapping'
 
@@ -76,10 +78,19 @@ module ROM
         )
       end
 
+      # @see Attribute#qualified_projection
+      #
+      # @api private
+      def qualified_projection(table_alias = nil)
+        meta(
+          func: ::Sequel::SQL::Function.new(func.name, *func.args.map { |arg| arg.respond_to?(:qualified_projection) ? arg.qualified_projection(table_alias) : arg })
+        )
+      end
+
       # @see Attribute#qualified?
       #
       # @api private
-      def qualified?(table_alias = nil)
+      def qualified?(_table_alias = nil)
         meta[:func].args.all?(&:qualified?)
       end
 
@@ -184,7 +195,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]
@@ -209,7 +220,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
 
@@ -245,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

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

data/lib/rom/sql/order_dsl.rb

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/associations'
 
 module ROM
@@ -48,7 +50,7 @@ module ROM
           # @see ROM::Command::ClassInterface.build
           #
           # @api public
-          def build(relation, options = EMPTY_HASH)
+          def build(relation, **options)
             command = super
 
             configured_assocs = command.configured_associations
@@ -146,7 +148,7 @@ module ROM
           def with_association(name, opts = EMPTY_HASH)
             self.class.build(
               relation,
-              { **options, associations: associations.merge(name => opts) }
+              **options, associations: associations.merge(name => opts)
             )
           end
         end

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

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

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

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

data/lib/rom/sql/plugins.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/plugins/relation/sql/instrumentation'
 require 'rom/plugins/relation/sql/auto_restrictions'
 

data/lib/rom/sql/projection_dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/dsl'
 require 'rom/sql/function'
 
@@ -29,7 +31,7 @@ module ROM
       #   users.select { function(:count, :id).as(:total) }
       #
       # @param [Symbol] name SQL function
-      # @param [Symbol] attr
+      # @param [Symbol] attrs
       #
       # @return [Rom::SQL::Function]
       #

data/lib/rom/sql/rake_task.rb

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

data/lib/rom/sql/relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/types'
 require 'rom/sql/schema'
 require 'rom/sql/attribute'
@@ -35,7 +37,7 @@ module ROM
           table = opts[:from].first
 
           if db.table_exists?(table)
-            select(*schema.map(&:qualified)).order(*schema.project(*schema.primary_key_names).qualified)
+            select(*schema.qualified_projection).order(*schema.project(*schema.primary_key_names).qualified)
           else
             self
           end

data/lib/rom/sql/relation/reading.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/support/inflector'
 require 'rom/sql/join_dsl'
 
@@ -891,8 +893,8 @@ module ROM
         #   @yieldparam relation [Array]
         #
         # @api public
-        def lock(options = EMPTY_HASH, &block)
-          clause = lock_clause(options)
+        def lock(**options, &block)
+          clause = lock_clause(**options)
 
           if block
             transaction do
@@ -1036,7 +1038,7 @@ module ROM
           stmt << ' OF ' << Array(of).join(', ') if of
 
           if skip_locked
-            raise ArgumentError, "SKIP LOCKED cannot be used with (NO)WAIT clause" if !wait.nil?
+            raise ArgumentError, 'SKIP LOCKED cannot be used with (NO)WAIT clause' if !wait.nil?
 
             stmt << ' SKIP LOCKED'
           else
@@ -1092,7 +1094,7 @@ module ROM
                 join_opts = EMPTY_HASH
               end
 
-              new(dataset.__send__(type, other.name.to_sym, join_cond, join_opts))
+              new(dataset.__send__(type, other.name.dataset.to_sym, join_cond, join_opts))
             else
               associations[other.name.key].join(type, self, other)
             end

data/lib/rom/sql/relation/writing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     class Relation < ROM::Relation

data/lib/rom/sql/restriction_dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/dsl'
 
 module ROM
@@ -6,7 +8,13 @@ module ROM
     class RestrictionDSL < DSL
       # @api private
       def call(&block)
-        instance_exec(select_relations(block.parameters), &block)
+        arg, kwargs = select_relations(block.parameters)
+
+        if kwargs.nil?
+          instance_exec(arg, &block)
+        else
+          instance_exec(**kwargs, &block)
+        end
       end
 
       private