rom-sql 3.6.4 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3a5d8acca77c2d148be8cdfc268eee1851619947eed8923d6b174a05c199a32
-  data.tar.gz: 3c3780102c9055ceada519a2638761b90b43ad3f1b8d6f71063c2aee6817f2f4
+  metadata.gz: 1a9c8d40ae3b5ea461ba889492c74ad82533ac881777d6aa2d8b120cb9c0196d
+  data.tar.gz: 3965d8abb7bf6a215b9c76ffe1acc4e697d9e9c4c07cd0ed1f33840cb089111f
 SHA512:
-  metadata.gz: 452127dc2b154c8e513efc34e698c8fe4de0be2de9e21746b584fa14cb3642d3a2ce3ba0d085db54fa6153a1b796a5fd422fce6e24095cd8588028ed7924670d
-  data.tar.gz: d8fec6ff6f5ad4ce1d37eca0a51a4ed0f412d8ef611ca29fbc41c285ff46ec419fd0e94cf17ebc63a4c7314791514de71400200826540d2aa5a366b21b7427ba
+  metadata.gz: 10ccbbcb73895cb55a998ff673666878f7ae4d103aca84ba286fa0f0b4b0a0ce068524a6d110cf9ffd0139f5b9eef8a6c7b7f40e407d4f9b6a72eba314d6af28
+  data.tar.gz: 2c4aa7721bb02e20edd71d574ab878c405a6325a53602e77a71d30c72eb0c249033aa20944aca2460047c0a0be0def9534dd0ef611d627e4f6710743cb829df5

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 3.7.0 2025-01-08
+
+### Changed
+
+- Minimum Ruby version is now 3.1 (@flash-gordon)
+
+[Compare v3.6.5...v3.7.0](https://github.com/rom-rb/rom-sql/compare/v3.6.5...v3.7.0)
+
+## 3.6.5 2024-12-25
+
+
+### Fixed
+
+- Fix syntax error under Ruby 3.4 (@flash-gordon)
+
+[Compare v3.6.4...v3.6.5](https://github.com/rom-rb/rom-sql/compare/v3.6.4...v3.6.5)
+
 ## 3.6.4 2024-07-01
 
 

data/README.md

@@ -21,8 +21,7 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.5`
-* jruby >= `9.2`
+* MRI >= `3.1`
 
 ## License
 

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

@@ -39,6 +39,8 @@ module ROM
           end
 
           # @api private
+          #
+          # rubocop:disable Metrics/AbcSize
           def self.restriction_methods(schema)
             mod = Module.new
 
@@ -46,7 +48,7 @@ module ROM
               next if index.partial?
 
               attributes = index.to_a
-              meth_name = :"by_#{ attributes.map(&:name).join('_and_') }"
+              meth_name = :"by_#{attributes.map(&:name).join("_and_")}"
 
               next if generated.include?(meth_name)
 
@@ -72,6 +74,7 @@ module ROM
             [methods, mod]
           end
         end
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

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

@@ -31,8 +31,12 @@ module ROM
           subscribe('configuration.relations.registry.created') do |event|
             registry = event[:registry]
 
-            relations = registry.select { |_, r| r.adapter == :sql && r.respond_to?(:notifications) }.to_h
-            db_notifications = relations.values.map { |r| [r.dataset.db, r.notifications] }.uniq.to_h
+            relations = registry.select { |_, r|
+              r.adapter == :sql && r.respond_to?(:notifications)
+            }.to_h
+            db_notifications = relations.values.map { |r|
+              [r.dataset.db, r.notifications]
+            }.uniq.to_h
 
             db_notifications.each do |db, notifications|
               next if db.respond_to?(:rom_instrumentation?)

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

@@ -26,7 +26,7 @@ module ROM
             #
             # @api public
             def explain(format: :text, **options)
-              bool_options = options.map { |opt, value| "#{opt.to_s.upcase} #{!!value}" }
+              bool_options = options.map { "#{_1.to_s.upcase} #{!!_2}" } # rubocop:disable Style/DoubleNegation
               format_option = "FORMAT #{format.to_s.upcase}"
               explain_value = [format_option, *bool_options].join(', ')
 

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

@@ -13,31 +13,48 @@ module ROM
             # By default, searching for the inclusion of any of the terms in any of the cols.
             #
             # @example
-            #   posts.full_text_search([:title, :content], 'apples', language: 'english') # => Relation which match the 'apples' phrase
+            #   posts.full_text_search([:title, :content], 'apples', language: 'english')
+            #   # => Relation which match the 'apples' phrase
             #
-            # @option :headline [String] Append a expression to the selected columns aliased to headline that contains an extract of the matched text.
+            # @option :headline [String]
+            #   Append a expression to the selected columns aliased
+            #   to headline that contains an extract of the matched text.
             #
-            # @option :language [String] The language to use for the search (default: 'simple')
+            # @option :language [String]
+            #   The language to use for the search (default: 'simple')
             #
-            # @option :plain [Boolean] Whether a plain search should be used (default: false).  In this case, terms should be a single string, and it will do a search where cols contains all of the words in terms.  This ignores search operators in terms.
+            # @option :plain [Boolean]
+            #   Whether a plain search should be used (default: false).
+            #   In this case, terms should be a single string, and it will do a search
+            #   where cols contains all of the words in terms.
+            #   This ignores search operators in terms.
             #
-            # @option :phrase [Boolean] Similar to :plain, but also adding an ILIKE filter to ensure that returned rows also include the exact phrase used.
+            # @option :phrase [Boolean]
+            #   Similar to :plain, but also adding an ILIKE filter to ensure
+            #   that returned rows also include the exact phrase used.
             #
-            # @option :rank [Boolean] Set to true to order by the rank, so that closer matches are returned first.
+            # @option :rank [Boolean]
+            #   Set to true to order by the rank, so that closer matches are returned first.
             #
-            # @option :to_tsquery [Symbol] Can be set to :plain or :phrase to specify the function to use to convert the terms to a ts_query.
+            # @option :to_tsquery [Symbol]
+            #   Can be set to :plain or :phrase to specify the function to use
+            #   to convert the terms to a ts_query.
             #
-            # @option :tsquery [Boolean] Specifies the terms argument is already a valid SQL expression returning a tsquery, and can be used directly in the query.
+            # @option :tsquery [Boolean]
+            #   Specifies the terms argument is already a valid SQL expression returning a tsquery,
+            #   and can be used directly in the query.
             #
-            # @option :tsvector [Boolean] Specifies the cols argument is already a valid SQL expression returning a tsvector, and can be used directly in the query.
+            # @option :tsvector [Boolean]
+            #   Specifies the cols argument is already a valid SQL expression returning a tsvector,
+            #   and can be used directly in the query.
             #
             # @return [Relation]
             #
             # @see https://www.postgresql.org/docs/current/textsearch.html PostgreSQL docs
             #
             # @api public
-            def full_text_search(*args, &block)
-              new dataset.__send__(__method__, *args, &block)
+            def full_text_search(...)
+              new dataset.__send__(__method__, ...)
             end
           end
         end
@@ -48,6 +65,8 @@ end
 
 ROM.plugins do
   adapter :sql do
-    register :pg_full_text_search, ROM::Plugins::Relation::SQL::Postgres::FullTextSearch, type: :relation
+    register :pg_full_text_search,
+             ROM::Plugins::Relation::SQL::Postgres::FullTextSearch,
+             type: :relation
   end
 end

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

@@ -13,7 +13,7 @@ module ROM
 
             class StreamingNotSupportedError < StandardError; end
 
-            subscribe("configuration.gateway.connected") do |opts|
+            subscribe('configuration.gateway.connected') do |opts|
               conn = opts[:connection]
 
               next unless conn.database_type.to_sym == :postgres
@@ -21,13 +21,13 @@ module ROM
               next if defined?(JRUBY_VERSION)
 
               begin
-                require "sequel_pg"
+                require 'sequel_pg'
               rescue LoadError
-                raise StreamingNotSupportedError, "add sequel_pg to Gemfile to use pg_streaming"
+                raise StreamingNotSupportedError, 'add sequel_pg to Gemfile to use pg_streaming'
               end
 
               unless Sequel::Postgres.supports_streaming?
-                raise StreamingNotSupportedError, "postgres version does not support streaming"
+                raise StreamingNotSupportedError, 'postgres version does not support streaming'
               end
 
               conn.extension(:pg_streaming)
@@ -52,7 +52,7 @@ module ROM
               #
               # @api publicY_VERSION
               def stream_each
-                raise StreamingNotSupportedError, "not supported on jruby"
+                raise StreamingNotSupportedError, 'not supported on jruby'
               end
             else
               # Allows you to stream returned rows one at a time, instead of
@@ -80,7 +80,7 @@ module ROM
 
               module Combined
                 def stream_each
-                  raise StreamingNotSupportedError, "not supported on combined relations"
+                  raise StreamingNotSupportedError, 'not supported on combined relations'
                 end
               end
 

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

@@ -12,15 +12,17 @@ module ROM
         include Associations::SelfRef
 
         # @api public
+        #
+        # rubocop:disable Metrics/AbcSize
         def call(target: self.target)
           left = join_assoc.(target: target)
 
           schema =
             if left.schema.key?(foreign_key)
-              if target != self.target
-                target.schema.merge(join_schema)
-              else
+              if target == self.target
                 left.schema.uniq.project(*columns)
+              else
+                target.schema.merge(join_schema)
               end
             else
               target_schema
@@ -34,6 +36,7 @@ module ROM
             schema.(relation)
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         # @api public
         def join(type, source = self.source, target = self.target)

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

@@ -12,6 +12,8 @@ module ROM
         include Associations::SelfRef
 
         # @api public
+        #
+        # rubocop:disable Metrics/AbcSize
         def call(target: self.target, preload: false)
           if preload
             schema = target.schema.qualified
@@ -41,6 +43,7 @@ module ROM
             schema.(relation)
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         # @api public
         def join(type, source = self.source, target = self.target)

data/lib/rom/sql/attribute.rb

@@ -15,6 +15,8 @@ module ROM
     # Extended schema attributes tailored for SQL databases
     #
     # @api public
+    #
+    # rubocop:disable Metrics/ClassLength
     class Attribute < ROM::Attribute
       include AttributeWrapping
       include AttributeAliasing
@@ -59,7 +61,9 @@ 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
@@ -263,8 +267,8 @@ module ROM
       # @return [SQL::Function]
       #
       # @api public
-      def func(&block)
-        ProjectionDSL.new(name => self).call(&block).first
+      def func(&)
+        ProjectionDSL.new(name => self).call(&).first
       end
 
       # Create a CONCAT function from the attribute
@@ -334,7 +338,7 @@ module ROM
       #
       # @api private
       def unwrap
-        cleaned_meta = meta.reject { |k, _| META_KEYS.include?(k) }
+        cleaned_meta = meta.except(*META_KEYS)
         type = optional? ? right : self.type
 
         self.class.new(type.with(meta: cleaned_meta), **options)
@@ -380,19 +384,28 @@ module ROM
       #
       # @api private
       def sql_expr
-        @sql_expr ||= (meta[:sql_expr] || to_sql_name)
+        @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
       end
 
       # Delegate to sql expression if it responds to a given method
       #
       # @api private
-      def method_missing(meth, *args, &block)
+      def method_missing(meth, *args, &)
         if OPERATORS.include?(meth)
           __cmp__(meth, args[0])
         elsif extensions.key?(meth)
-          extensions[meth].(type, sql_expr, *args, &block)
+          extensions[meth].(type, sql_expr, *args, &)
         elsif sql_expr.respond_to?(meth)
-          meta(sql_expr: sql_expr.__send__(meth, *args, &block))
+          meta(sql_expr: sql_expr.__send__(meth, *args, &))
         else
           super
         end
@@ -436,5 +449,6 @@ module ROM
 
       memoize :joined, :to_sql_name, :table_name, :canonical
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/rom/sql/attribute_aliasing.rb

@@ -19,8 +19,7 @@ module ROM
           sql_expr: alias_sql_expr(sql_expr, new_alias_name)
         )
       end
-      alias as aliased
-
+      alias_method :as, :aliased
 
       # Return true if this attribute is an aliased projection
       #
@@ -46,7 +45,7 @@ module ROM
       #
       # @api private
       def aliased_projection?
-        self.meta[:sql_expr].is_a?(Sequel::SQL::AliasedExpression)
+        meta[:sql_expr].is_a?(::Sequel::SQL::AliasedExpression)
       end
 
       private
@@ -54,8 +53,10 @@ 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
@@ -70,7 +71,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]}".to_sym
+          new_name = :"#{meta[:wrapped]}_#{options[:alias]}"
 
           # 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

@@ -60,10 +60,11 @@ module ROM
         # Yields tuples for insertion or return an enumerator
         #
         # @api private
-        def with_input_tuples(tuples)
-          input_tuples = Array([tuples]).flatten(1).map
+        def with_input_tuples(tuples, &)
+          input_tuples = [tuples].flatten(1).map
           return input_tuples unless block_given?
-          input_tuples.each { |tuple| yield(tuple) }
+
+          input_tuples.each(&)
         end
       end
     end

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

@@ -52,10 +52,11 @@ module ROM
         # Yields tuples for insertion or return an enumerator
         #
         # @api private
-        def with_input_tuples(tuples)
-          input_tuples = Array([tuples]).flatten(1).map
+        def with_input_tuples(tuples, &)
+          input_tuples = [tuples].flatten(1).map
           return input_tuples unless block_given?
-          input_tuples.each { |tuple| yield(tuple) }
+
+          input_tuples.each(&)
         end
       end
     end

data/lib/rom/sql/dsl.rb

@@ -59,7 +59,9 @@ 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/extensions/active_support_notifications.rb

@@ -24,4 +24,4 @@ module ROM
   end
 end
 
-Sequel::Database.send(:prepend, ROM::SQL::ActiveSupportInstrumentation)
+Sequel::Database.prepend ROM::SQL::ActiveSupportInstrumentation

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

@@ -6,17 +6,17 @@ module ROM
       class TypeBuilder < Schema::TypeBuilder
         defines :db_numeric_types, :db_type_mapping, :db_array_type_matcher
 
-        db_numeric_types %w[
-          smallint integer bigint
-          decimal numeric real
-          double\ precision serial bigserial
+        db_numeric_types [
+          'smallint', 'integer', 'bigint',
+          'decimal', 'numeric', 'real',
+          'double precision', 'serial', 'bigserial'
         ].to_set.freeze
 
         db_type_mapping(
-          'uuid'  => Types::UUID,
+          'uuid' => Types::UUID,
           'money' => Types::Money,
           'bytea' => Types::Bytea,
-          'json'  => Types::JSON,
+          'json' => Types::JSON,
           'jsonb' => Types::JSONB,
           'xml' => Types::XML,
           'inet' => Types::IPAddress,
@@ -39,7 +39,7 @@ module ROM
           'ltree' => Types::LTree
         ).freeze
 
-        db_array_type_matcher '[]'.freeze
+        db_array_type_matcher '[]'
 
         def map_pk_type(type, db_type, **options)
           if numeric?(type, db_type)

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

@@ -36,8 +36,8 @@ module ROM
 
         def call(type)
           super do
-            if type.respond_to?(:primitive) && type.primitive.equal?(Array)
-              "#{ type.meta[:type] }[]"
+            if type.respond_to?(:primitive) && type.primitive.equal?(::Array)
+              "#{type.meta[:type]}[]"
             end
           end
         end

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

@@ -37,7 +37,7 @@ module ROM
         Point = Type('point') do
           SQL::Types.define(Values::Point) do
             input do |point|
-              "(#{ point.x },#{ point.y })"
+              "(#{point.x},#{point.y})"
             end
 
             output do |point|
@@ -50,7 +50,7 @@ module ROM
         Line = Type('line') do
           SQL::Types.define(Values::Line) do
             input do |line|
-              "{#{ line.a },#{ line.b },#{line.c}}"
+              "{#{line.a},#{line.b},#{line.c}}"
             end
 
             output do |line|
@@ -63,7 +63,7 @@ module ROM
         Circle = Type('circle') do
           SQL::Types.define(Values::Circle) do
             input do |circle|
-              "<(#{ circle.center.x },#{ circle.center.y }),#{ circle.radius }>"
+              "<(#{circle.center.x},#{circle.center.y}),#{circle.radius}>"
             end
 
             output do |circle|
@@ -77,8 +77,8 @@ module ROM
         Box = Type('box') do
           SQL::Types.define(Values::Box) do
             input do |box|
-              "((#{ box.upper_right.x },#{ box.upper_right.y }),"\
-              "(#{ box.lower_left.x },#{ box.lower_left.y }))"
+              "((#{box.upper_right.x},#{box.upper_right.y})," \
+                "(#{box.lower_left.x},#{box.lower_left.y}))"
             end
 
             output do |box|
@@ -93,8 +93,8 @@ module ROM
         LineSegment = Type('lseg') do
           SQL::Types.define(Values::LineSegment) do
             input do |segment|
-              "[(#{ segment.begin.x },#{ segment.begin.y }),"\
-              "(#{ segment.end.x },#{ segment.end.y })]"
+              "[(#{segment.begin.x},#{segment.begin.y})," \
+                "(#{segment.end.x},#{segment.end.y})]"
             end
 
             output do |segment|
@@ -109,8 +109,8 @@ module ROM
         Polygon = Type('polygon') do
           SQL::Types.define(::Array) do
             input do |points|
-              points_joined = points.map { |p| "(#{ p.x },#{ p.y })" }.join(',')
-              "(#{ points_joined })"
+              points_joined = points.map { |p| "(#{p.x},#{p.y})" }.join(',')
+              "(#{points_joined})"
             end
 
             output do |polygon|
@@ -123,12 +123,12 @@ module ROM
         Path = Type('path') do
           SQL::Types.define(Values::Path) do
             input do |path|
-              points_joined = path.to_a.map { |p| "(#{ p.x },#{ p.y })" }.join(',')
+              points_joined = path.to_a.map { |p| "(#{p.x},#{p.y})" }.join(',')
 
               if path.open?
-                "[#{ points_joined }]"
+                "[#{points_joined}]"
               else
-                "(#{ points_joined })"
+                "(#{points_joined})"
               end
             end
 

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

@@ -77,11 +77,15 @@ module ROM
           end
         else
           JSON = Type('json') do
-            (SQL::Types::Array | SQL::Types::Hash).constructor(Sequel.method(:pg_json)).meta(read: JSONRead)
+            (SQL::Types::Array | SQL::Types::Hash).constructor(
+              ::Sequel.method(:pg_json)
+            ).meta(read: JSONRead)
           end
 
           JSONB = Type('jsonb') do
-            (SQL::Types::Array | SQL::Types::Hash).constructor(Sequel.method(:pg_jsonb)).meta(read: JSONRead)
+            (SQL::Types::Array | SQL::Types::Hash).constructor(
+              ::Sequel.method(:pg_jsonb)
+            ).meta(read: JSONRead)
           end
         end
 
@@ -265,7 +269,9 @@ module ROM
           end
 
           def has_key(_type, expr, key)
-            Attribute[SQL::Types::Bool].meta(sql_expr: wrap(expr).has_key?(key))
+            Attribute[SQL::Types::Bool].meta(
+              sql_expr: wrap(expr).has_key?(key) # rubocop:disable Style/PreferredHashMethods
+            )
           end
 
           def has_any_key(_type, expr, *keys)