rom-sql 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef99832857b3fd2134904b5c5cd99d33ad1665d8
-  data.tar.gz: 5a08cac386afc1d218d51a19d5d2a2167cb617d7
+  metadata.gz: b4f8bdb0d753d19b5bb7be8f3d9282312f634e5d
+  data.tar.gz: dff2a952b88aa4457dc58adfc69a60e636a64527
 SHA512:
-  metadata.gz: 712552863d0d9a5cb8c4ce14557ed8705bc274bddff9c9c3b613379a93f470aac04fa5eddce7d133ad1ffe9bd024d05bb08cd052babf7a158cf0da320cbf55d3
-  data.tar.gz: a0baf07fda4b9eb66fa0e296a39e2f1d7ed641db3fe3f9feaacf4d2ad8a2b587902c4f335115fa3edd662c5e0aca818bc3140528591a2eeb9b12b2e602bfa3a1
+  metadata.gz: 837cc9f183231b155420771c55408db56779aee6adb8d97c9ad378cbe82f4047774d93b764d064f5ecddfe3521081f02a91445d394ba6aa014e607382a69fd02
+  data.tar.gz: 20c1e14423d4113a1aef6d03bd68a2e1a41232b562891fbf53b01b7ffea185e27d15d902c5bd72734f30b330e515ad2e6a831831d990694dc6c3226aedf786da

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.2.1 2017-03-09
+
+### Fixed
+
+* Allow for joining by a `RelationProxy` instance from `rom-repository` (davydovanton)
+
+[Compare v1.2.0...v1.2.1](https://github.com/rom-rb/rom-sql/compare/v1.2.0...v1.2.1)
+
 ## v1.2.0 2017-03-07
 
 ### Added

data/lib/rom/sql/relation/reading.rb

@@ -809,15 +809,14 @@ module ROM
         #
         # @api private
         def __join__(type, other, join_cond = EMPTY_HASH, opts = EMPTY_HASH, &block)
-          case other
-          when Symbol, Association::Name
+          if other.is_a?(Symbol) || other.is_a?(Association::Name)
             if join_cond.empty?
               assoc = associations[other]
               assoc.join(__registry__, type, self, __registry__[assoc.target.relation])
             else
               new(dataset.__send__(type, other.to_sym, join_cond, opts, &block))
             end
-          when Relation
+          elsif other.respond_to?(:name) && other.name.is_a?(Relation::Name)
             associations[other.name.dataset].join(__registry__, type, self, other)
           else
             raise ArgumentError, "+other+ must be either a symbol or a relation, #{other.class} given"

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.2.1'.freeze
   end
 end

data/spec/unit/relation/inner_join_spec.rb

@@ -103,6 +103,21 @@ RSpec.describe ROM::Relation, '#inner_join' do
                                    ])
       end
 
+      let(:task_relation_proxy) { Class.new{ def name; ROM::Relation::Name.new(:tasks); end }.new }
+
+      it 'joins relation with relation proxy objects' do
+        result = relation.
+                   inner_join(task_relation_proxy).
+                   select(:name, tasks[:title])
+
+        expect(result.schema.map(&:name)).to eql(%i[name title])
+
+        expect(result.to_a).to eql([
+                                     { name: 'Jane', title: "Jane's task" },
+                                     { name: 'Joe', title: "Joe's task" }
+                                   ])
+      end
+
       it 'joins relation with join keys inferred for m:m-through' do
         result = tasks.inner_join(tags)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -346,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: SQL databases support for ROM