flounder 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9298bfc2f968429143600db83b178317276c90ee
-  data.tar.gz: 7f8a6080dc2be42627cbf3b15a2b9af46a93e8b9
+  metadata.gz: 7e5d88da3b8782b8bb2fb07e95392a2123f894cd
+  data.tar.gz: 9a166526a02b00dcb1095f1ce7a785d5f4a32034
 SHA512:
-  metadata.gz: e3446da6ec7625773c5ee45064646ab0d309a430bec819817e37bf9c9776dffcb31095b50e2f358f5af4bb62adb643f828ec7edb9dcc71c7360eb8564df009aa
-  data.tar.gz: 98ca2a21ffd6e01a5b76a0d1d7f9d93562dee7ef8eab859410b4baf95a8ae9925f2073d1ea20c17e4c2595bb937b23f8a24aa180cd1755e3e516c01e46d21db7
+  metadata.gz: add6543b9ef0cbf7670cedf9e7f976bb45a615bbe08d80ba6ec864dfdd3e8e78a057c7e40bed41e717db414582c6c5aaa0b52450ad23478229533cf42398f702
+  data.tar.gz: 4eca98ff56f180af2c35b0ef5f2e563297e87b1fb05b65ebfd908e2abd8612774cf7dc283d20d56ebbdc87be0d6dadb7f3d7d9a6d5be020d58353b5aae2ae22a

data/flounder.gemspec

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

@@ -31,33 +31,7 @@ module Flounder::Query
     #   query.where(:id.noteq => 1)   # ... WHERE id != 1 
     #
     def where *conditions
-      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.where(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
+      parse_conditions(*conditions) { |bit| manager.where(bit) }
     end 
 
     def with name, query
@@ -104,7 +78,45 @@ module Flounder::Query
       # should be overridden
     end
 
-     # Rewrites a statement that contains bind placeholders like '$1' to
+    # Parses a conditions array like it is found with #where and #having and
+    # calls the block for each condition bit. Returns self.
+    #
+    # Example:  
+    #   parse_conditions(conditions) { |bit| manager.where(bit) }
+    #
+    def parse_conditions *conditions, &apply
+      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|
+          apply.call(
+            transform_tuple(resolve_entity, k, v))
+        end
+        return self
+      end
+
+      # maybe conditions is of the second form?
+      conditions.each do |cond_str, *values|
+        apply.call(
+          Arel::Nodes::SqlLiteral.new(
+            rewrite_bind_variables(cond_str, bind_values.size, values.size)))
+        bind_values.concat values
+      end
+      return self
+    end
+
+    # Rewrites a statement that contains bind placeholders like '$1' to
     # contain placeholders starting at offset+1. Also checks that no
     # placeholder exceeds the limit.
     # 

data/lib/flounder/query/select.rb

@@ -92,34 +92,7 @@ module Flounder::Query
       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    
+      parse_conditions(*conditions) { |bit| manager.having(bit) }
     end
 
     # Orders by a list of field references. 

data/qed/selects.md

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - Kaspar Schiess