rom-sql 3.6.0 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd16261df5aee3251449218ae148340eff0718a1fdc2da7ed15504810f4a0b57
-  data.tar.gz: dc889208691825ead3b1bd5099d24cf102a2c62edfc92a5dff9a5a47a3dbebf5
+  metadata.gz: a66a6f386f99391a91f6e72d746bf252ebfcf7428c225d98b19035e6f2a1b09a
+  data.tar.gz: 828f97dec8dbe879462a7185f7fcf68df4a70e5a76583bc033d2d28e571e4ca2
 SHA512:
-  metadata.gz: 9af6cf7c57dea4550c2ce843005315cbf8cea6222b5e2c8fba9061ba22082cb111d5623ef1183e11dd9f59426f5eb572bcc95781f4aa94df0bfa883310882f10
-  data.tar.gz: ea1aadd57d67f6f6c3bbfa337e72e82817a9bc17475653b4d715e8a86068e3643a7c18f96840bec62c9af37fdd13badd3ed7687b5560b9e555dc593e874f1ac5
+  metadata.gz: ff8b53eda3cae629dd719e459647033c59de0f605a83d3b2b616ee1780673f1e25a655e8df9da5b9bc66ac60893be927240a906734f1f92785ee7e24dcfd637d
+  data.tar.gz: 2d35c254478bd63ad9636c6f6f7ae516c39c463adc98eae524dcac0b04673138f43a9499c76014f98fb8c554abb14b3f734b3195bfbd6b54e75ce06d9f24c8ab

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
-## 3.6.0
+## 3.6.1 2022-11-22
+
+### Fixed
+
+- Mapping of cidr types in PostgreSQL to IPAddr values (@flash-gordon)
+
+[Compare v3.6.0...v3.6.1](https://github.com/rom-rb/rom-sql/compare/v3.6.0...v3.6.1)
+
+## 3.6.0 2022-11-11
 
 ### Added
 

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/relation/reading.rb

@@ -11,7 +11,7 @@ module ROM
       # @api public
       module Reading
         # Row-level lock modes
-        ROW_LOCK_MODES = Hash.new(update: 'FOR UPDATE'.freeze).update(
+        ROW_LOCK_MODES = Hash.new({ update: "FOR UPDATE" }).update(
           # https://www.postgresql.org/docs/current/static/sql-select.html#SQL-FOR-UPDATE-SHARE
           postgres: {
             update: 'FOR UPDATE'.freeze,

data/lib/rom/sql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: SQL databases support for ROM