flounder 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f4ec6bd3fa4f14eccf7efa8d3aed4e81a3d8e08
-  data.tar.gz: cba009f5dc2b519b4636b643b7ac1d02bd9a493c
+  metadata.gz: f116f6520c4017a543634696a1d98c17cf3208d9
+  data.tar.gz: 9471a11ee88f27827a3c6ac3ecdeea6218c5b0b2
 SHA512:
-  metadata.gz: 81a859be8701dc7aa497f17949ed8bb8db93cb22daaba9c24796d5d225ef4cfd936174f132648bde9755d67b4aa15c92db2c09e404fec28280e4db62d3fa302b
-  data.tar.gz: 85f24647fe87ddd7a788df1f0722811fd828d4e0c5c570c6ac295e40d9ef6d4e5fb3ead5526a20bf35566f2132638c7b355ba0e1291697e79c20f8c63a6d9c38
+  metadata.gz: 2746df8286f4a3d5068e482321e556581778fb96acba83d1c89cae63dfa76846f8e7abcbadd43e2d59b6b5edc8a44e144a2b439176e4d8c484eb00e7c20e7f1f
+  data.tar.gz: 45eb6fa78492db34ed608b1f45a9490a626dda10c4912366fd1dd1420f7f515d5c7bc4902e35c03432470d8ddc7607714c98e1ae188ba017239539fefeea5e51

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.15.0'
+  s.version  = '0.15.1'
   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

@@ -109,6 +109,15 @@ module Flounder::Query
         return self
       end
 
+      # or maybe this is a Flounder::Expression::Expr? 
+      if conditions.size == 1 && conditions.first.kind_of?(Flounder::Expression::Expr)
+        condition = conditions.first
+        apply.call(
+          Arel::Nodes::SqlLiteral.new(condition.to_sql))
+        
+        return self
+      end
+
       # maybe conditions is of the second form?
       conditions.each do |cond_str, *values|
         apply.call(

data/qed/expressions.md

@@ -15,3 +15,10 @@ You can also pass a condition-like hash to expr directly, it will return a Ruby
   (users.cond(:posts, a: 1) | users.cond(a: 2)).
     assert generates_sql("((\"posts\".\"a\" = 1) OR (\"users\".\"a\" = 2))")
 ~~~
+
+These condition pieces can be used in a WHERE-clause directly. 
+
+~~~ruby
+  users.where(users.cond(id: 1)).
+   assert generates_sql("SELECT [fields] FROM \"users\"  WHERE (\"users\".\"id\" = 1)") 
+~~~

metadata

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