rom-sql 3.6.2 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a66a6f386f99391a91f6e72d746bf252ebfcf7428c225d98b19035e6f2a1b09a
-  data.tar.gz: 828f97dec8dbe879462a7185f7fcf68df4a70e5a76583bc033d2d28e571e4ca2
+  metadata.gz: a3a5d8acca77c2d148be8cdfc268eee1851619947eed8923d6b174a05c199a32
+  data.tar.gz: 3c3780102c9055ceada519a2638761b90b43ad3f1b8d6f71063c2aee6817f2f4
 SHA512:
-  metadata.gz: ff8b53eda3cae629dd719e459647033c59de0f605a83d3b2b616ee1780673f1e25a655e8df9da5b9bc66ac60893be927240a906734f1f92785ee7e24dcfd637d
-  data.tar.gz: 2d35c254478bd63ad9636c6f6f7ae516c39c463adc98eae524dcac0b04673138f43a9499c76014f98fb8c554abb14b3f734b3195bfbd6b54e75ce06d9f24c8ab
+  metadata.gz: 452127dc2b154c8e513efc34e698c8fe4de0be2de9e21746b584fa14cb3642d3a2ce3ba0d085db54fa6153a1b796a5fd422fce6e24095cd8588028ed7924670d
+  data.tar.gz: d8fec6ff6f5ad4ce1d37eca0a51a4ed0f412d8ef611ca29fbc41c285ff46ec419fd0e94cf17ebc63a4c7314791514de71400200826540d2aa5a366b21b7427ba

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 3.6.4 2024-07-01
+
+
+### Fixed
+
+- Excessive logging when same gateway is shared between multiple containers (@flash-gordon)
+- Warning about using color option from active-support log subscriber (@flash-gordon + @bendangelo)
+
+
+[Compare v3.6.3...v3.6.4](https://github.com/rom-rb/rom-sql/compare/v3.6.3...v3.6.4)
+
+## 3.6.3 2024-05-06
+
+
+### Fixed
+
+- Fix using `.filter` with a block for aggregate functions (@flash-gordon)
+
+
+[Compare v3.6.2...v3.6.3](https://github.com/rom-rb/rom-sql/compare/v3.6.2...v3.6.3)
+
+## 3.6.2 2024-01-09
+
+
+### Fixed
+
+- Fix Hash.new warning in Ruby 3.3 (@flash-gordon)
+
+
+[Compare v3.6.1...v3.6.2](https://github.com/rom-rb/rom-sql/compare/v3.6.1...v3.6.2)
+
 ## 3.6.1 2022-11-22
 
 ### Fixed

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

@@ -35,6 +35,8 @@ module ROM
             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?)
+
               instrumenter = Instrumenter.new(db.database_type, notifications)
               db.extend(instrumenter)
             end
@@ -56,6 +58,8 @@ module ROM
 
             # @api private
             def initialize(name, notifications)
+              super()
+
               @name = name
               @notifications = notifications
               define_log_connection_yield
@@ -68,6 +72,8 @@ module ROM
               name = self.name
               notifications = self.notifications
 
+              define_method(:rom_instrumentation?) { true }
+
               define_method(:log_connection_yield) do |*args, &block|
                 notifications.instrument(:sql, name: name, query: args[0]) do
                   super(*args, &block)

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

@@ -5,6 +5,21 @@ require 'active_support/log_subscriber'
 module ROM
   module SQL
     class RailsLogSubscriber < ActiveSupport::LogSubscriber
+      as_version =
+        begin
+          require "active_support/gem_version"
+          ActiveSupport.gem_version
+        rescue LoadError
+          nil
+        end
+
+      COLOR_OPTION =
+        if as_version && as_version >= Gem::Version.new("7.2")
+          {color: true}
+        else
+          true
+        end
+
       def sql(event)
         return unless logger.debug?
 
@@ -15,10 +30,10 @@ module ROM
         binds = payload[:binds].to_a.inspect if payload[:binds]
 
         if odd?
-          name = color(name, :cyan, true)
-          sql  = color(sql, nil, true)
+          name = color(name, :cyan, COLOR_OPTION)
+          sql  = color(sql, nil, COLOR_OPTION)
         else
-          name = color(name, :magenta, true)
+          name = color(name, :magenta, COLOR_OPTION)
         end
 
         debug "  #{name}  #{sql}  #{binds}"

data/lib/rom/sql/projection_dsl.rb

@@ -37,7 +37,7 @@ module ROM
       #
       # @api public
       def function(name, *attrs)
-        ::ROM::SQL::Function.new(::ROM::Types::Any, schema: schema).public_send(name, *attrs)
+        ::ROM::SQL::Function.new(::ROM::Types::Any).meta(schema: schema).public_send(name, *attrs)
       end
       alias_method :f, :function
 
@@ -57,7 +57,7 @@ module ROM
 
           if type
             if args.empty?
-              ::ROM::SQL::Function.new(type, schema: schema)
+              ::ROM::SQL::Function.new(type).meta(schema: schema)
             else
               ::ROM::SQL::Attribute[type].value(args[0])
             end

data/lib/rom/sql/restriction_dsl.rb

@@ -27,7 +27,7 @@ module ROM
           type = type(meth)
 
           if type
-            ::ROM::SQL::Function.new(type)
+            ::ROM::SQL::Function.new(type).meta(schema: schema)
           else
             ::Sequel::VIRTUAL_ROW.__send__(meth, *args, &block)
           end

data/lib/rom/sql/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module SQL
-    VERSION = '3.6.2'.freeze
+    VERSION = "3.6.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.4
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel