sqlstmt 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eea31417385f00ff44f3de6c5b3f4189dee5fc1a
-  data.tar.gz: 75f4bc36ea768d7adc4c22257edc46507d00928d
+  metadata.gz: 71856d6d6a16c77177845cdbf42d45f463820061
+  data.tar.gz: 8a45ed2aa1fd13dc9e25205973a7b45534ee5dd2
 SHA512:
-  metadata.gz: 0c88c7be9a31bd556031b6caa3ea35f06f7f7f0d1b0056dad45b92bd2154a047b6ce511c94a95597916d49033db714b8108e5bdf43d05614c74b7f1f3d90f6d2
-  data.tar.gz: 7ce5bfee85d705899e425970d9824885ca8007b7b3fba31c9f3f2dd240bce4e4bb3e5449a0a2e0e84af8cce0274e2fbaeccd35755f24bef7a084aaa718151224
+  metadata.gz: dc23412799b7caacfac2e2d7484e2f89f09ba18ae9729d26935a2cfe96f80c000eaeb71aeef45bb9253fc582dd590d621fc793ae7f8b9706e70a40637d99d890
+  data.tar.gz: b17eda5368198378d59a25cd2cec5e0f474af4acbe56819a7904aacb6df7fb769856e8e6a028311d0f91b4854b24699b808b4b2c2d35dedeb1596fc8433a7bf4

data/lib/sqlstmt/query.rb

@@ -20,8 +20,8 @@ class Query
     self
   end
 
-  def join(table, expr)
-    @joins << ['JOIN', table, "ON #{expr}"]
+  def join(table, *exprs)
+    @joins << ['JOIN', table, "ON #{exprs.join(' AND ')}"]
     self
   end
 
@@ -36,8 +36,8 @@ class Query
     self
   end
 
-  def left_join(table, expr)
-    @joins << ['LEFT JOIN', table, "ON #{expr}"]
+  def left_join(table, *exprs)
+    @joins << ['LEFT JOIN', table, "ON #{exprs.join(' AND ')}"]
     self
   end
 

data/test/select.dt.rb

@@ -42,6 +42,14 @@ class TestSelect < DohTest::TestGroup
     sqlb.optional_join('other o', 'z.blee_id = o.blee_id')
     assert_equal('SELECT frog FROM source s JOIN other o ON z.blee_id = o.blee_id', sqlb.to_s)
   end
+
+  def test_join_with_multiple_conditions
+    %i(join left_join).each do |method|
+      sqlb = Select.new.table('source s').field('frog').no_where.send(method, 'other o', 'z.blee_id = o.blee_id', 'z.other_field = o.other_field')
+      method_sql = method.to_s.upcase.sub('_', ' ')
+      assert_equal("SELECT frog FROM source s #{method_sql} other o ON z.blee_id = o.blee_id AND z.other_field = o.other_field", sqlb.to_s)
+    end
+  end
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil