flounder 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 644cfad15bfccebed7cfb43c43ac22fde0151f8d
-  data.tar.gz: 38a5f5158fac174f9380e20380b22188b23dd33f
+  metadata.gz: 9298bfc2f968429143600db83b178317276c90ee
+  data.tar.gz: 7f8a6080dc2be42627cbf3b15a2b9af46a93e8b9
 SHA512:
-  metadata.gz: 7217b361145c7813b8d17c54c05e2396fca0a21644e2d61aa21514e97106cdb535dabd62259c24a395464cbda85c9f8d002d8dd4c0478b351a239b9d862d7d93
-  data.tar.gz: 1567204faa27723677978ee4acc63d25d3aae8b0ccdfa3491bb454adb4bfb6d90e6e19a74990037443eb738461c8927521e8190ffe9f84fa4c33503342d5d7b6
+  metadata.gz: e3446da6ec7625773c5ee45064646ab0d309a430bec819817e37bf9c9776dffcb31095b50e2f358f5af4bb62adb643f828ec7edb9dcc71c7360eb8564df009aa
+  data.tar.gz: 98ca2a21ffd6e01a5b76a0d1d7f9d93562dee7ef8eab859410b4baf95a8ae9925f2073d1ea20c17e4c2595bb937b23f8a24aa180cd1755e3e516c01e46d21db7

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    flounder (0.4.0)
+    flounder (0.9.8)
       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

@@ -14,4 +14,5 @@
  + 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.
- + JOIN ... AND is now working.
+ + JOIN ... AND is now working.
+ + GROUP BY - HAVING should work as expected.

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.9.12'
+  s.version  = '0.9.13'
   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/entity.rb

@@ -108,7 +108,7 @@ module Flounder
     end
 
     # Query initiators
-    [:where, :join, :outer_join, :project, :order_by].each do |name|
+    [:where, :join, :outer_join, :project, :order_by, :group_by].each do |name|
       define_method name do |*args|
         select { |q| q.send(name, *args) }
       end

data/lib/flounder/query/select.rb

@@ -91,6 +91,36 @@ module Flounder::Query
       manager.group *map_to_arel(field_list)
       self
     end
+    def having *conditions
+      # TODO mostly duplicates #where!!!
+      conditions = conditions.dup
+
+      resolve_entity = entity
+
+      # is the first argument an entity? if yes, interpret field names relative
+      # to that entity. 
+      if conditions.size > 1 && entity_like?(conditions.first)
+        resolve_entity = convert_to_entity(conditions.shift)
+      end
+
+      # is this a hash? extract the first element
+      if conditions.size == 1 && conditions.first.kind_of?(Hash)
+        conditions = conditions.first 
+
+        conditions.each do |k, v|
+          manager.having(transform_tuple(resolve_entity, k, v))
+        end
+        return self
+      end
+
+      # maybe conditions is of the second form?
+      conditions.each do |cond_str, *values|
+        manager.where(
+          Arel::Nodes::SqlLiteral.new(
+            rewrite_bind_variables(cond_str, bind_values.size, values.size)))
+        bind_values.concat values
+      end    
+    end
 
     # Orders by a list of field references. 
     #

data/qed/selects.md

@@ -64,3 +64,9 @@ Sometimes you have to say it with a subquery. For example, you might want to loo
   row.post.id.assert == 1
 ~~~
 
+# GROUP BY and HAVING
+
+~~~ruby
+  posts.group_by(:id).having(id: 0, user_id: 2).
+    assert generates_sql("SELECT [fields] FROM \"posts\"  GROUP BY \"posts\".\"id\" HAVING \"posts\".\"id\" = 0 AND \"posts\".\"user_id\" = 2")
+~~~

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Flounder is a way to write SQL simply in Ruby. It deals with everything BUT