rom-sql 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd16261df5aee3251449218ae148340eff0718a1fdc2da7ed15504810f4a0b57
-  data.tar.gz: dc889208691825ead3b1bd5099d24cf102a2c62edfc92a5dff9a5a47a3dbebf5
+  metadata.gz: cc51c9abdc25fa792a3115391e4dbb169d8c7dba6bac5553810140013d097836
+  data.tar.gz: 9b96d61a4dbdb7fa422f66e04933f89c513e429d5576cb6ce5c3c41acec96649
 SHA512:
-  metadata.gz: 9af6cf7c57dea4550c2ce843005315cbf8cea6222b5e2c8fba9061ba22082cb111d5623ef1183e11dd9f59426f5eb572bcc95781f4aa94df0bfa883310882f10
-  data.tar.gz: ea1aadd57d67f6f6c3bbfa337e72e82817a9bc17475653b4d715e8a86068e3643a7c18f96840bec62c9af37fdd13badd3ed7687b5560b9e555dc593e874f1ac5
+  metadata.gz: 185d71f20d84f614f47511bd1f5f21fd03cfd5d6f0734431464cfa895bb5a1b263798becd891c26b54498c50970d73dcb43cda8c34b2a90a25ca5e164a3921e9
+  data.tar.gz: 57926f14bd364b7abbab21c5bb6d89a53989029e84540e88e9b3b4695abc60509d741884e52313e329f676cfb787ce53eeaf8519794672e75d60f66162bbfb9a

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 <!--- 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)
+
+## 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/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module SQL
-    VERSION = '3.6.0'.freeze
+    VERSION = '3.6.1'.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.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel