rom-sql 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f52d96de5f0817d048ca81908d0e1548fde8437314ce2842732fa0de1bc2a45
-  data.tar.gz: e194b0a48c85a5a4651dcc1ff073f34e256aad05d22ff8255d16c17418948acf
+  metadata.gz: a1b112ea9690e7cc6292907784ff4a1fa4b5104156b49f15ce7aa8e5b0f7ffac
+  data.tar.gz: 2812251110ba0677d9187564f199a6d28e0f61b198f36f4c241455132e789123
 SHA512:
-  metadata.gz: 7b9c43411663f8c89bc6df66df77afae600c1b053deb786b23aa7aabafcce6692b8265a11fe9431ea985cdff4d186d8d27cad7407729e2ddf8db8fc38dbb8d09
-  data.tar.gz: 9ccb96a9bf4d8d2a6dd638313317fd992e925b1ad5bd4447813e74f6ff2e4a916a10376f37e8982bb0ac09647299a412bbcd27be2f95966f7d28d27e23789559
+  metadata.gz: 72d567632369f93fed528c8bc469532f14d564054f85ef24f8a9a5dc23c57979f12345e54e3a44b2a2ef2db33d6a468489fa9d65ca006532b1c4ca04354ac545
+  data.tar.gz: 35703da2994cd323a3af2980ca624b2fdced01593f0a06aa78cafc0b9d8670e8c11129d38894b3df4d65063e1d62b4fdc5a7515e9ee4281e483d86acdda4a73c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.2.0 2020-01-11
+
+### Fixed
+
+- Keyword warnings on Ruby 2.7 (@flash-gordon)
+
+[Compare v3.1.0...v3.2.0](https://github.com/rom-rb/rom-sql/compare/v3.1.0...v3.2.0)
+
 ## 3.1.0 2019-12-16
 
 ### Added

data/lib/rom-sql.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'rom/sql'

data/lib/rom/plugins/relation/sql/auto_restrictions.rb

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

data/lib/rom/plugins/relation/sql/instrumentation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module Plugins
     module Relation

data/lib/rom/plugins/relation/sql/postgres/explain.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module Plugins
     module Relation
@@ -24,14 +26,11 @@ module ROM
             #
             # @api public
             def explain(format: :text, **options)
-              bool_options = options.map { |opt, value| "#{ opt.to_s.upcase } #{ !!value }" }
-              format_option = "FORMAT #{ format.to_s.upcase }"
+              bool_options = options.map { |opt, value| "#{opt.to_s.upcase} #{!!value}" }
+              format_option = "FORMAT #{format.to_s.upcase}"
+              explain_value = [format_option, *bool_options].join(', ')
 
-              query =
-                "EXPLAIN (" <<
-                [format_option, *bool_options].join(', ') <<
-                ") " <<
-                dataset.sql
+              query = "EXPLAIN (#{explain_value}) #{dataset.sql}"
 
               rows = dataset.with_sql(query).map(:'QUERY PLAN')
 

data/lib/rom/sql.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/equalizer'
 
 require 'rom/core'

data/lib/rom/sql/associations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/associations/many_to_many'
 require 'rom/sql/associations/many_to_one'
 require 'rom/sql/associations/one_to_many'

data/lib/rom/sql/associations/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     module Associations
@@ -19,7 +21,7 @@ module ROM
         def wrapped
           new_target = view ? target.send(view) : target
           to_wrap = self.class.allocate
-          to_wrap.send(:initialize, definition, options.merge(target: new_target))
+          to_wrap.send(:initialize, definition, **options, target: new_target)
           to_wrap.wrap
         end
       end

data/lib/rom/sql/associations/many_to_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/associations/many_to_many'
 require 'rom/sql/associations/core'
 require 'rom/sql/associations/self_ref'

data/lib/rom/sql/associations/many_to_one.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/associations/many_to_one'
 require 'rom/sql/associations/core'
 require 'rom/sql/associations/self_ref'

data/lib/rom/sql/associations/one_to_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/associations/one_to_many'
 require 'rom/sql/associations/core'
 require 'rom/sql/associations/self_ref'

data/lib/rom/sql/associations/one_to_one.rb

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

data/lib/rom/sql/associations/one_to_one_through.rb

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

data/lib/rom/sql/associations/self_ref.rb

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

data/lib/rom/sql/attribute.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sequel/core'
 require 'dry/core/cache'
 
@@ -19,16 +21,18 @@ module ROM
 
       OPERATORS = %i[>= <= > <].freeze
       NONSTANDARD_EQUALITY_VALUES = [true, false, nil].freeze
-      META_KEYS = %i(index foreign_key target sql_expr qualified).freeze
+      META_KEYS = %i[index foreign_key target sql_expr qualified].freeze
 
       # Error raised when an attribute cannot be qualified
       QualifyError = Class.new(StandardError)
 
       extend Dry::Core::Cache
 
-      # @api private
-      def self.[](*args)
-        fetch_or_store(args) { new(*args) }
+      class << self
+        # @api private
+        def [](type, options = EMPTY_HASH)
+          fetch_or_store([type, options]) { new(type, **options) }
+        end
       end
 
       # Return a new attribute in its canonical form
@@ -318,7 +322,7 @@ module ROM
         cleaned_meta = meta.reject { |k, _| META_KEYS.include?(k) }
         type = optional? ? right : self.type
 
-        self.class.new(type.with(meta: cleaned_meta), options)
+        self.class.new(type.with(meta: cleaned_meta), **options)
       end
 
       # Wrap a value with the type, it allows using attribute and type specific methods

data/lib/rom/sql/commands.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/commands'
 
 require 'rom/sql/commands/create'

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

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

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

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

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

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

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

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

data/lib/rom/sql/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'concurrent/map'
 require 'rom/support/inflector'
 require 'rom/constants'
@@ -27,7 +29,13 @@ module ROM
 
       # @api private
       def call(&block)
-        result = instance_exec(select_relations(block.parameters), &block)
+        arg, kwargs = select_relations(block.parameters)
+
+        if kwargs.nil?
+          result = instance_exec(arg, &block)
+        else
+          result = instance_exec(**kwargs, &block)
+        end
 
         if result.is_a?(::Array)
           result
@@ -82,9 +90,9 @@ module ROM
           keys = parameters.select { |type, _| type == :keyreq }
 
           if keys.empty?
-            relations
+            [relations, nil]
           else
-            keys.each_with_object({}) { |(_, k), rs| rs[k] = relations[k] }
+            [nil, keys.each_with_object({}) { |(_, k), rs| rs[k] = relations[k] }]
           end
         end
       end

data/lib/rom/sql/error.rb

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

data/lib/rom/sql/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sequel/deprecated'
 require 'sequel/exceptions'
 

data/lib/rom/sql/extensions.rb

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sequel/database/logging'
 require 'active_support/notifications'
 

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

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

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/extensions/postgres/commands'
 require 'rom/sql/extensions/postgres/types'
 require 'rom/sql/extensions/postgres/type_builder'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/commands/create'
 require 'rom/sql/commands/update'
 

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

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     module Postgres
       class TypeBuilder < Schema::TypeBuilder
         defines :db_numeric_types, :db_type_mapping, :db_array_type_matcher
 
-        db_numeric_types %w(
+        db_numeric_types %w[
           smallint integer bigint
           decimal numeric real
           double\ precision serial bigserial
-        ).to_set.freeze
+        ].to_set.freeze
 
         db_type_mapping(
           'uuid'  => Types::UUID,
@@ -39,11 +41,11 @@ module ROM
 
         db_array_type_matcher '[]'.freeze
 
-        def map_pk_type(type, db_type, options = {})
+        def map_pk_type(type, db_type, **options)
           if numeric?(type, db_type)
             type = self.class.numeric_pk_type
           else
-            type = map_type(type, db_type, options)
+            type = map_type(type, db_type, **options)
           end
 
           type.meta(primary_key: true)

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sequel/core'
 
 require 'rom/sql/type_extensions'

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'sequel/core'
 
-Sequel.extension(*%i(pg_array pg_array_ops))
+Sequel.extension(:pg_array, :pg_array_ops)
 
 require 'rom/sql/extensions/postgres/types/array_types'
 
@@ -120,7 +122,7 @@ module ROM
             Attribute[type].meta(sql_expr: expr.pg_array[idx])
           end
 
-          def any(type, expr, value)
+          def any(_type, expr, value)
             Attribute[SQL::Types::Bool].meta(sql_expr: { value => expr.pg_array.any })
           end
 
@@ -128,7 +130,7 @@ module ROM
             Attribute[SQL::Types::Bool].meta(sql_expr: expr.pg_array.contained_by(type[other]))
           end
 
-          def length(type, expr)
+          def length(_type, expr)
             Attribute[SQL::Types::Integer].meta(sql_expr: expr.pg_array.length)
           end
 
@@ -140,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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/type_extensions'
 
 module ROM
@@ -52,7 +54,7 @@ module ROM
             end
           end
 
-          def build_read_type(db_type, member_type)
+          def build_read_type(_db_type, member_type)
             if member_type && member_type.meta[:read]
               base_read_type.of(member_type.meta[:read])
             else

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

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

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'sequel/core'
 require 'singleton'
 
-Sequel.extension(*%i(pg_json pg_json_ops))
+Sequel.extension(:pg_json, :pg_json_ops)
 
 module ROM
   module SQL
@@ -228,11 +230,11 @@ module ROM
             end
           end
 
-          def get(type, expr, *path)
+          def get(_type, expr, *path)
             Attribute[json_type].meta(sql_expr: wrap(expr)[path_args(path)])
           end
 
-          def get_text(type, expr, *path)
+          def get_text(_type, expr, *path)
             Attribute[SQL::Types::String].meta(sql_expr: wrap(expr).get_text(path_args(path)))
           end
 
@@ -240,7 +242,7 @@ module ROM
 
           def path_args(path)
             case path.size
-            when 0 then raise ArgumentError, "wrong number of arguments (given 0, expected 1+)"
+            when 0 then raise ArgumentError, 'wrong number of arguments (given 0, expected 1+)'
             when 1 then path[0]
             else path
             end
@@ -254,32 +256,32 @@ module ROM
         TypeExtensions.register(JSONB) do
           include JSONMethods[JSONB, :pg_jsonb.to_proc]
 
-          def contain(type, expr, value)
+          def contain(_type, expr, value)
             Attribute[SQL::Types::Bool].meta(sql_expr: wrap(expr).contains(value))
           end
 
-          def contained_by(type, expr, value)
+          def contained_by(_type, expr, value)
             Attribute[SQL::Types::Bool].meta(sql_expr: wrap(expr).contained_by(value))
           end
 
-          def has_key(type, expr, key)
+          def has_key(_type, expr, key)
             Attribute[SQL::Types::Bool].meta(sql_expr: wrap(expr).has_key?(key))
           end
 
-          def has_any_key(type, expr, *keys)
+          def has_any_key(_type, expr, *keys)
             Attribute[SQL::Types::Bool].meta(sql_expr: wrap(expr).contain_any(keys))
           end
 
-          def has_all_keys(type, expr, *keys)
+          def has_all_keys(_type, expr, *keys)
             Attribute[SQL::Types::Bool].meta(sql_expr: wrap(expr).contain_all(keys))
           end
 
-          def merge(type, expr, value)
+          def merge(_type, expr, value)
             Attribute[JSONB].meta(sql_expr: wrap(expr).concat(value))
           end
           alias_method :+, :merge
 
-          def delete(type, expr, *path)
+          def delete(_type, expr, *path)
             sql_expr = path.size == 1 ? wrap(expr) - path : wrap(expr).delete_path(path)
             Attribute[JSONB].meta(sql_expr: sql_expr)
           end