rom-sql 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aee35c2fa20e158c0dcaf4f72ae6649209016cb
-  data.tar.gz: f3272a901d950df4c9b8846a5fa13e004490e4e8
+  metadata.gz: 930bb93fc7cdf5236b363f9f1f343e400f567e92
+  data.tar.gz: bc4abbac8eedc26e82b4599ce80657ad99dacab5
 SHA512:
-  metadata.gz: 8ce44faf6d367af7b9b8e7546991a758f984310c7de2916726782992e0ddcb4e33c13d0c24cab684cfd5cc9a532901859e6110af060b035fd13240e05e284c78
-  data.tar.gz: 28a2cc3e5f7d90c5fe8ef8e5de8fc437a5d0eb5fa6c5f91162279095476c6eb57b4e3ee786b6a89da5cc0c031762cfce0a91b362b87bcc73fe12c73a232eb510
+  metadata.gz: 672c4a3ed57a3b3d2de8cb996fddfc0819da3de23af2dbdf6fdb6c962f4d2a5eda7e773e2e8768be403ed0643dd620124e0c3ac8f9c1e841e54d44d7887b0757
+  data.tar.gz: 9c0573d506286947956602885042246478f1798ba82622f5574f959a7eca5b2eba4487de670cf3655d2ee50365011f487bca2b506c076fd8f0edf95045f54689

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.3.5 2017-10-12
+
+### Changed
+
+* Added compatibility with `dry-types` 0.11  (flash-gordon)
+
+[Compare v1.3.4..v1.3.5](https://github.com/rom-rb/rom-sql/compare/v1.3.4...v1.3.5)
+
 ## v1.3.4 2017-09-12
 
 ### Fixed

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 gem 'rom', git: 'https://github.com/rom-rb/rom.git', branch: 'release-3.0'
 
 group :test do
-  gem 'byebug', platforms: :mri
+  gem 'pry-byebug', platforms: :mri
   gem 'pry', platforms: %i(jruby rbx)
   gem 'dry-struct'
   gem 'activesupport', '~> 5.0'

data/lib/rom/sql/attribute.rb

@@ -28,9 +28,10 @@ module ROM
           # @return [Hash]
           #
           # @api public
-          def [](type)
-            unwrapped = type.optional? ? type.right : type
-            @types[unwrapped.pristine] || EMPTY_HASH
+          def [](wrapped)
+            type = wrapped.default? ? wrapped.type : wrapped
+            type = type.optional? ? type.right : type
+            @types[type.meta[:database]][type.meta[:db_type]] || EMPTY_HASH
           end
 
           # Registers a set of operations supported for a specific type
@@ -46,15 +47,20 @@ module ROM
           #
           # @api public
           def register(type, &block)
+            extensions = @types[type.meta[:database]]
+            db_type = type.meta[:db_type]
+
             raise ArgumentError, "Type #{ type } already registered" if @types.key?(type)
             mod = Module.new(&block)
             ctx = Object.new.extend(mod)
             functions = mod.public_instance_methods.each_with_object({}) { |m, ms| ms[m] = ctx.method(m) }
-            @types[type] = functions
+            extensions[db_type] = functions
           end
         end
 
-        @types = {}
+        @types = ::Hash.new do |hash, database|
+          hash[database] = {}
+        end
       end
 
       extend Dry::Core::Cache

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

@@ -50,7 +50,7 @@ module ROM
 
         def map_type(ruby_type, db_type, enum_values: nil, **_)
           if db_type.end_with?(self.class.db_array_type_matcher)
-            Types::PG::Array(db_type)
+            Types::PG::Array(db_type[0...db_type.size-2])
           elsif enum_values
             Types::String.enum(*enum_values)
           else

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

@@ -16,8 +16,16 @@ module ROM
 
         Array = Types.Definition(Sequel::Postgres::PGArray)
 
+        @array_types = ::Hash.new do |hash, type|
+          name = "#{ type }[]"
+          array_type = Array.constructor(-> (v) { Sequel.pg_array(v, type) }).
+                         meta(type: name, db_type: name, database: 'postgres')
+          Attribute::TypeExtensions.register(array_type) { include ArrayMethods }
+          hash[type] = array_type
+        end
+
         def self.Array(db_type)
-          Array.constructor(-> (v) { Sequel.pg_array(v, db_type) }).meta(type: db_type)
+          @array_types[db_type]
         end
 
         # @!parse
@@ -109,7 +117,7 @@ module ROM
         #     #
         #     #   @api public
         #   end
-        Attribute::TypeExtensions.register(Array.constructor -> {  }) do
+        module ArrayMethods
           def contain(type, expr, other)
             Attribute[Types::Bool].meta(sql_expr: expr.pg_array.contains(type[other]))
           end
@@ -147,6 +155,10 @@ module ROM
           end
         end
 
+        Attribute::TypeExtensions.register(Array.constructor -> {  }) do
+          include ArrayMethods
+        end
+
         # JSON
 
         JSONArray = Types.Constructor(Sequel::Postgres::JSONArray, &Sequel.method(:pg_json))
@@ -155,7 +167,7 @@ module ROM
 
         JSONOp = Types.Constructor(Sequel::Postgres::JSONOp, &Sequel.method(:pg_json))
 
-        JSON = JSONArray | JSONHash | JSONOp
+        JSON = (JSONArray | JSONHash | JSONOp).meta(database: 'postgres', db_type: 'jsonb')
 
         # JSONB
 
@@ -165,7 +177,7 @@ module ROM
 
         JSONBOp = Types.Constructor(Sequel::Postgres::JSONBOp, &Sequel.method(:pg_jsonb))
 
-        JSONB = JSONBArray | JSONBHash | JSONBOp
+        JSONB = (JSONBArray | JSONBHash | JSONBOp).meta(database: 'postgres', db_type: 'jsonb')
 
         # @!parse
         #   class ROM::SQL::Attribute

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '1.3.4'.freeze
+    VERSION = '1.3.5'.freeze
   end
 end

data/rom-sql.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'sequel', '~> 4.43'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'dry-types', '~> 0.10.2'
+  spec.add_runtime_dependency 'dry-types', '~> 0.11.0'
   spec.add_runtime_dependency 'dry-core', '~> 0.3'
   spec.add_runtime_dependency 'rom', '~> 3.2', '>= 3.2.2'
 

data/spec/integration/schema/inferrer/postgres_spec.rb

@@ -63,7 +63,7 @@ RSpec.describe 'ROM::SQL::Schema::PostgresInferrer', :postgres do
              jsonb_data: ROM::SQL::Types::PG::JSONB.optional.meta(name: :jsonb_data, source: source),
              money: ROM::SQL::Types::Decimal.meta(name: :money, source: source),
              tags: ROM::SQL::Types::PG::Array('text').optional.meta(name: :tags, source: source),
-             tag_ids: ROM::SQL::Types::PG::Array('biging').optional.meta(name: :tag_ids, source: source),
+             tag_ids: ROM::SQL::Types::PG::Array('bigint').optional.meta(name: :tag_ids, source: source),
              color: ROM::SQL::Types::String.enum(*colors).optional.meta(name: :color, source: source),
              ip: ROM::SQL::Types::PG::IPAddress.optional.meta(
                name: :ip,

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ require 'logger'
 require 'tempfile'
 
 begin
-  require 'byebug'
+  require 'pry-byebug'
 rescue LoadError
   require 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
@@ -345,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: SQL databases support for ROM