rom-sql 3.6.3 → 3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10de6edf52d1ae5d345bc22f2c884ab9f35d39f52ed1b31afc227c39c97e2922
-  data.tar.gz: 865b5d0f4aabdd7fc5911ec269e43977257212517d9373574861c47fa79e1af8
+  metadata.gz: cbc16afacec4f00a9b508c4bed68298b6761644be79903b69835531a0ec91141
+  data.tar.gz: 78e3d647bee05b90821261073034ee7d6bd18f12dd240c32e92068b873bd37d5
 SHA512:
-  metadata.gz: 1630dea45a0f30921a6298ea279d817e48d0bff6953639164304d4c308eb48a442b3ffe68dde0259e28ec0412a8b4ecea0c36bfc1c739d7ccbdaaa7dc49b2ac5
-  data.tar.gz: df51ba2b2674e601f7f44fb492e65bf753ed1cc258599eedd2a2f0fc8100f7dd694899cc461492e93f3c5d98cad2dfe4901e7754965f177e147c636b3d7d14d1
+  metadata.gz: fd5ba27726315fa0dcf547c98aee77790e361830060054bdccbcfaf0c114a49d0ab4c22036dee0b77118f5a87ccbad939caafa6d1e2f1a7e723e44550c5fd90e
+  data.tar.gz: 2dec52f75e5eb999618515c841af58e4af76595a2222a29087f5c9f823c7769d0e2acbf6ff5f1696fe6f8bfcd123ebf789fc7c1c181aaa5aee8fd1c97ac311c1

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 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
+
+
+### 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
 
 

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/function.rb

@@ -40,7 +40,7 @@ module ROM
       WINDOW_FRAMES[nil] = nil
       WINDOW_FRAMES[:all] = WINDOW_FRAMES[rows: [:start, :end]]
       WINDOW_FRAMES[:rows] = WINDOW_FRAMES[rows: [:start, :current]]
-      WINDOW_FRAMES[range: :current] = WINDOW_FRAMES[range: [:current, :current]]
+      WINDOW_FRAMES[{ range: :current }] = WINDOW_FRAMES[range: [:current, :current]]
 
       # Return a new attribute with an alias
       #

data/lib/rom/sql/schema/type_builder.rb

@@ -37,6 +37,10 @@ module ROM
 
         numeric_pk_type Types::Serial
 
+        TYPE_GUESSES = {
+          /datetime\((\d+)\)/ => :datetime
+        }.freeze
+
         def call(primary_key:, db_type:, type:, allow_null:, **rest)
           if primary_key
             map_pk_type(type, db_type, **rest)
@@ -64,7 +68,7 @@ module ROM
 
         # @api private
         def map_type(ruby_type, db_type, **kw)
-          type = self.class.ruby_type_mapping[ruby_type]
+          type = self.class.ruby_type_mapping[ruby_type || guess_type(db_type)]
 
           if db_type.is_a?(String) && db_type.include?('numeric') || db_type.include?('decimal')
             map_decimal_type(db_type)
@@ -75,6 +79,15 @@ module ROM
           end
         end
 
+        # @api private
+        def guess_type(db_type)
+          TYPE_GUESSES.find do |regex, type|
+            if db_type.is_a?(String) && db_type.match(regex)
+              break type
+            end
+          end
+        end
+
         # @api private
         def map_decimal_type(type)
           precision = DECIMAL_REGEX.match(type)

data/lib/rom/sql/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module SQL
-    VERSION = '3.6.3'
+    VERSION = "3.6.5"
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.5
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -220,7 +219,6 @@ metadata:
   documentation_uri: https://api.rom-rb.org/rom-sql/
   mailing_list_uri: https://discourse.rom-rb.org/
   bug_tracker_uri: https://github.com/rom-rb/rom-sql/issues
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -235,8 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: SQL databases support for ROM
 test_files: []