flounder 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb355b42b818e47d6d615cb550779211635fe40c
-  data.tar.gz: c7ecc8ba5b4b1bde6c8ac9213d0733f64fa169be
+  metadata.gz: 644cfad15bfccebed7cfb43c43ac22fde0151f8d
+  data.tar.gz: 38a5f5158fac174f9380e20380b22188b23dd33f
 SHA512:
-  metadata.gz: 97d33b0970b670b8f53a6785c1b15ad060fe6756f93fc5d63cfbf55cf8e5c32005c3a37eef2a46d5cff82e787e61d0a1c8af825174791bc9f1382fff1f2873e0
-  data.tar.gz: 1e9786ec35fbe6f53300f6f010051a265888d45bf3ed263d9ccf8d9be118253338f4fb787314e880d80f4f1b25f90ca965a38c2795c20f778e525c07f26f205d
+  metadata.gz: 7217b361145c7813b8d17c54c05e2396fca0a21644e2d61aa21514e97106cdb535dabd62259c24a395464cbda85c9f8d002d8dd4c0478b351a239b9d862d7d93
+  data.tar.gz: 1567204faa27723677978ee4acc63d25d3aae8b0ccdfa3491bb454adb4bfb6d90e6e19a74990037443eb738461c8927521e8190ffe9f84fa4c33503342d5d7b6

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    flounder (0.9.8)
+    flounder (0.4.0)
       arel (~> 5, > 5.0.1)
       connection_pool (~> 2)
       hashie (~> 3, >= 3.2)
-      pg (~> 0.17)
+      pg (> 0.17)
 
 GEM
   remote: https://rubygems.org/

data/HISTORY

@@ -13,4 +13,5 @@
  + localized where as in where(entity, :field => value)
  + db.where(entity, hash) form, where all symbols are looked up in entity. 
  + db.entity.join(:other_entity) is now allowed
- + :symbol.in => ... is now working.
+ + :symbol.in => ... is now working.
+ + JOIN ... AND is now working.

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.9.11'
+  s.version  = '0.9.12'
   s.summary  = "Flounder is a way to write SQL simply in Ruby. It deals with everything BUT object relational mapping. "
   s.email    = "kaspar.schiess@technologyastronauts.ch"
   s.homepage = "https://bitbucket.org/technologyastronauts/oss_flounder"

data/lib/flounder/query/select.rb

@@ -66,9 +66,8 @@ module Flounder::Query
     end
 
     def on join_conditions
-      k, v = join_conditions.first
       manager.on(
-          transform_tuple(entity, k, join_field(v)))
+        *join_conditions.map { |(k, v)| transform_tuple(entity, k, join_field(v)) })
       self
     end
     def anchor

data/qed/joins.md

@@ -0,0 +1,21 @@
+
+Joins are correctly created.
+
+~~~ruby
+  query = domain[:posts].
+    join(users).on(:user_id => :id)
+
+  query.assert generates_sql(%Q(SELECT [fields] FROM "posts" INNER JOIN "users" ON "posts"."user_id" = "users"."id"))
+
+  row = query.first
+  row.post.id.assert == 1
+~~~
+
+Joins are … joined using AND.
+
+~~~ruby
+  query = domain[:posts].
+    join(users).on(:user_id => :id, :strange_example_id => :id)
+
+  query.assert generates_sql(%Q(SELECT [fields] FROM "posts" INNER JOIN "users" ON "posts"."user_id" = "users"."id" AND "posts"."strange_example_id" = "users"."id"))
+~~~

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -123,6 +123,7 @@ files:
 - qed/flounder.sql
 - qed/index.md
 - qed/inserts.md
+- qed/joins.md
 - qed/ordering.md
 - qed/projection.md
 - qed/results.md
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Flounder is a way to write SQL simply in Ruby. It deals with everything BUT
@@ -165,6 +166,7 @@ test_files:
 - qed/flounder.sql
 - qed/index.md
 - qed/inserts.md
+- qed/joins.md
 - qed/ordering.md
 - qed/projection.md
 - qed/results.md