rom-sql 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e459278c95be56ea5da82ea6c6fec9a5bbc443f0865832cea04d3b1b56fbf5a
-  data.tar.gz: fa89dd7f60db5748c69eb85f804a1f2a9076ccfb22828e7dd9c27a7611c5bc2a
+  metadata.gz: 9ca5db918213ed1a81ec7e5b526849393a4f6223cb4107a2ee1ea54cc6148b81
+  data.tar.gz: e1742760f02aad6e90025742b3d8d91c2f52d94e495b398e4886431b82d61a71
 SHA512:
-  metadata.gz: 9496cf5afbb38f14782b9104ce05519b2b35674a6fe1ad799f9f34a7f717ad67f4bb79063720818159ff723789bf15e823f55a3d350e7fb30ab6c93607fb8807
-  data.tar.gz: 7a39e507a4ee369e45693d835a47852b2ccad837251b4b426e41496f63650dccd05038eb4dd47126f88b023e1b49a5fae4a2e4ad7af3745f43fd69c6b31f5142
+  metadata.gz: 73d5948cbae27d6032552805bcad6365d52c18784d0cfeb86391890e89de9d5902c4154898ab96bfc32481aec8e5e6f555febc38faecd8983163a0902897b4ad
+  data.tar.gz: 7ada4412f647ff39c116044320bdb253fcebc5696caed50cb8158e1be8f440d221af2b601708f1fc06297e818c1e1e1af61d0fbeaa8bb9c949d87f7df7d9aca9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.0.1 2019-05-05
+
+### Fixed
+
+* Using joins with a relation object as the target and a block-based conditions produces correct query now (issue #331) (solnic)
+
+[Compare v3.0.0...v3.0.1](https://github.com/rom-rb/rom-sql/compare/v3.0.0...v3.0.1)
+
 ## 3.0.0 2019-04-24
 
 ### Added

data/README.md

@@ -2,8 +2,9 @@
 [travis]: https://travis-ci.org/rom-rb/rom-sql
 [codeclimate]: https://codeclimate.com/github/rom-rb/rom-sql
 [inchpages]: http://inch-ci.org/github/rom-rb/rom-sql
+[chat]: https://rom-rb.zulipchat.com
 
-# rom-sql
+# rom-sql [![Join the chat at https://rom-rb.zulipchat.com](https://img.shields.io/badge/rom--rb-join%20chat-942283.svg)][chat]
 
 [![Gem Version](https://badge.fury.io/rb/rom-sql.svg)][gem]
 [![Build Status](https://travis-ci.org/rom-rb/rom-sql.svg?branch=master)][travis]

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

@@ -1048,9 +1048,11 @@ module ROM
         # @api private
         def __join__(type, other, join_cond = EMPTY_HASH, opts = EMPTY_HASH, &block)
           if other.is_a?(Symbol) || other.is_a?(ROM::Relation::Name)
-            if join_cond.empty?
+            if join_cond.equal?(EMPTY_HASH) && !block
               assoc = associations[other]
               assoc.join(type, self)
+            elsif block
+              __join__(type, other, JoinDSL.new(schema).(&block), opts)
             else
               new(dataset.__send__(type, other.to_sym, join_cond, opts, &block))
             end

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '3.0.0'.freeze
+    VERSION = '3.0.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel