rom-sql 3.5.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72190a3c5b2df9cf0bc5db0ba2a4cae185f88e87dfa9ad7d0f7cf3967c1fe048
-  data.tar.gz: acd353e5348e8c797275829dacfedb445289e5e76d636df4b5cb7b40c1f48e7b
+  metadata.gz: cc51c9abdc25fa792a3115391e4dbb169d8c7dba6bac5553810140013d097836
+  data.tar.gz: 9b96d61a4dbdb7fa422f66e04933f89c513e429d5576cb6ce5c3c41acec96649
 SHA512:
-  metadata.gz: 93bc3e2cb1873865a886d221d34ff164a7d83de2ddaec4f6f3d99daf65465a14ded348c546151ae9d44e6eae6ca4dded468cc7386ff4513d6b02bab843485f14
-  data.tar.gz: 6c45fd11d745c05d1f536700c1cb246dd358e09668a406377281486b3d062c366db847dea96e457170e518e104baf64bb296f41613dd0099b5ffb7e839cd7679
+  metadata.gz: 185d71f20d84f614f47511bd1f5f21fd03cfd5d6f0734431464cfa895bb5a1b263798becd891c26b54498c50970d73dcb43cda8c34b2a90a25ca5e164a3921e9
+  data.tar.gz: 57926f14bd364b7abbab21c5bb6d89a53989029e84540e88e9b3b4695abc60509d741884e52313e329f676cfb787ce53eeaf8519794672e75d60f66162bbfb9a

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 3.6.1 2022-11-22
+
+### Fixed
+
+- Mapping of cidr types in PostgreSQL to IPAddr values (@flash-gordon)
+
+## 3.6.0 2022-11-11
+
+### Added
+
+- Add ROM::SQL::RakeSupport.migration_options for passing custom options to migrator (@wuarmin)
+
+### Changed
+
+- Upgraded to the latest versions of dry-rb dependencies, compatible with rom 5.3 (@flash-gordon)
+
+[Compare v3.5.0...v3.6.0](https://github.com/rom-rb/rom-sql/compare/v3.5.0...v3.6.0)
+
 ## 3.5.0 2021-03-26
 
 

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

@@ -20,7 +20,7 @@ module ROM
           'jsonb' => Types::JSONB,
           'xml' => Types::XML,
           'inet' => Types::IPAddress,
-          'cidr' => Types::IPAddress,
+          'cidr' => Types::IPNetwork,
           'macaddr' => SQL::Types::String,
           'point' => Types::Point,
           'hstore' => Types::HStore,

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

@@ -16,6 +16,7 @@ module ROM
             Types::JSONB => 'jsonb',
             Types::HStore => 'hstore',
             Types::IPAddress => 'inet',
+            Types::IPNetwork => 'cidr',
             Types::Point => 'point',
             Types::Line => 'line',
             Types::Circle => 'circle',

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

@@ -7,9 +7,22 @@ module ROM
     module Postgres
       module Types
         IPAddress = Type('inet') do
-          read = SQL::Types.Constructor(IPAddr) { |ip| IPAddr.new(ip.to_s) }
+          read = SQL::Types.Constructor(IPAddr) { |ip| ::IPAddr.new(ip.to_s) }
 
-          SQL::Types.Constructor(IPAddr, &:to_s).meta(read: read)
+          SQL::Types.Constructor(::IPAddr, &:to_s).meta(read: read)
+        end
+
+        IPNetwork = Type('cidr') do
+          read = SQL::Types.Constructor(IPAddr) do |ip|
+            case ip
+            when ::IPAddr
+              ip
+            when String
+              ::IPAddr.new(ip)
+            end
+          end
+
+          SQL::Types.Constructor(::IPAddr) { |ip| "#{ip}/#{ip.prefix}" }.meta(read: read)
         end
       end
     end

data/lib/rom/sql/function.rb

@@ -89,7 +89,12 @@ module ROM
 
       # @api private
       def new(&block)
-        meta(func: ::Sequel::SQL::Function.new!(func.name, func.args.map(&block), func.opts))
+        case func
+        when ::Sequel::SQL::Function
+          meta(func: ::Sequel::SQL::Function.new!(func.name, func.args.map(&block), func.opts))
+        else
+          meta(func: func)
+        end
       end
 
       # @see Attribute#qualified?

data/lib/rom/sql/tasks/migration_tasks.rake

@@ -10,7 +10,7 @@ module ROM
 
       class << self
         def run_migrations(options = {})
-          gateway.run_migrations(options)
+          gateway.run_migrations(migration_options.merge(options))
         end
 
         def create_migration(*args)
@@ -24,6 +24,13 @@ module ROM
         # @api public
         attr_accessor :env
 
+
+        # Migration options, which are passed to `ROM::SQL::RakeSupport.run_migrations`. You can 
+        # set them in the `db:setup` task with `ROM::SQL::RakeSupport.migration_options = { ... }`
+        #
+        # @api public
+        attr_accessor :migration_options
+
         private
 
         def gateway
@@ -40,6 +47,7 @@ module ROM
       end
 
       @env = nil
+      @migration_options = {}
     end
   end
 end

data/lib/rom/sql/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module SQL
-    VERSION = '3.5.0'.freeze
+    VERSION = '3.6.1'.freeze
   end
 end

data/lib/rom/sql.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rom
   requirement: !ruby/object:Gem::Requirement
@@ -234,14 +228,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: SQL databases support for ROM