flounder 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2a4bab6f9430ad7169aafe13673bb79debf2d1a
-  data.tar.gz: ddaa62449b7848ba338f79e48c22eab8d95da823
+  metadata.gz: 5e50bc0d92b9351ee20f0dbf9ca3881acf3c58a7
+  data.tar.gz: 45da1bd52d62d5fd874f45788564d068e1c47e3a
 SHA512:
-  metadata.gz: ef55ee6011bb3a31c99161529775800e347691a93b39b685eb6561c7ad0364a2f1b37d03e8c4236dd99e32d63cfd656900aed69404ffe2143e846dafaac34f91
-  data.tar.gz: c86cfee4eb453d63af98b23da4a5faeaad3292a3023b983631c159c53ad7bb7037eacd3cc2a8c341b73e0144f79db3166d9377eea5ac0bf10b1f34182f93fad4
+  metadata.gz: 87dfe61309ca308686f916ad8475649210720162d660426a6dbaf43dde7e23d8be1c3bc4ce893a901a3623157bc8a2127ff4a52b1f97b9f1f04e5748f5e9bce4
+  data.tar.gz: 067d2ef4f6e7adc18e4a1c9a4ef1b5c11ce0bcc00d7ad95648776cccbbcfaf0835e2f995dfa9aec8a633aa2d1cec2cec6354194bcc552ae0400d66da4cbd37a9

data/HISTORY

@@ -16,4 +16,9 @@
  + DELETE FROM - entity#delete
 
  0.9.4 
- + nested transactions
+ + nested transactions
+
+ 0.9.5
+ + subquery support
+ + localized where as in where(entity, :field => value)
+ 

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.9.4'
+  s.version  = '0.9.5'
   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,12 +31,22 @@ 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 && conditions.first.kind_of?(Flounder::Entity)
+        resolve_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(k, v))
+          manager.where(transform_tuple(resolve_entity, k, v))
         end
         return self
       end
@@ -125,21 +135,31 @@ module Flounder::Query
     #  * #where
     #  * #on
     #
-    def transform_tuple field, value
+    def transform_tuple entity, field, value
       if value.kind_of? Flounder::Field
         value = value.arel_field
       end
 
+      if defined?(DataMapper) && 
+        defined?(DataMapper::Query::Operator) &&
+        field.kind_of?(DataMapper::Query::Operator)
+
+        # interop: datamapper hijacks some of our operators, let's reverse this
+        field = Flounder::SymbolExtensions::Modifier.new(
+          field.target, field.operator)
+      end
+
       case field
         # covers: :field_a => ...
         when Symbol
-          join_and_condition_part(entity[field].arel_field, value)
+          join_and_condition_part(entity, entity[field].arel_field, value)
         # covers: entity[:field] => ...
         when Flounder::Field
-          join_and_condition_part(field.arel_field, value)
+          join_and_condition_part(entity, field.arel_field, value)
         # covers: :field_a.noteq => ...
         when Flounder::SymbolExtensions::Modifier
           join_and_condition_part(
+            entity, 
             field.to_arel_field(entity), 
             value, 
             field.kind)
@@ -147,8 +167,11 @@ module Flounder::Query
         fail "Could not transform condition part. (#{field.inspect}, #{value.inspect})"
       end
     end
-    def join_and_condition_part arel_field, value, kind=:eq
+    def join_and_condition_part entity, arel_field, value, kind=:eq
       case value
+        # covers subselects
+        when Flounder::Query::Base
+          arel_field.send(kind, value.manager)
         # covers :field_a => :field_b
         when Symbol
           value_field = entity[value].arel_field

data/lib/flounder/query/select.rb

@@ -66,7 +66,7 @@ module Flounder::Query
     def on join_conditions
       join_conditions.each do |k, v|
         manager.on(
-          transform_tuple(k, join_field(v)))
+          transform_tuple(entity, k, join_field(v)))
       end
       self
     end
@@ -102,6 +102,10 @@ module Flounder::Query
       self
     end
 
+    def limit n
+      manager.take n
+    end
+
     alias all kick
 
     def each &block
@@ -133,8 +137,8 @@ module Flounder::Query
     # or respects field values passed in. 
     #
     def join_field name
-      return name if name.kind_of? Flounder::Field
-      @last_join[name]
+      return @last_join[name] if name.kind_of?(Symbol)
+      name
     end
 
     # Maps an array of field references to Flounder::Field objects. A field 

data/lib/flounder.rb

@@ -31,6 +31,11 @@ module_function
   def domain connection, &block
     Domain.new(connection).tap { |d| yield d if block_given? }
   end
+
+  def literal str
+    Arel::Nodes::SqlLiteral.new(str)
+  end
+  module_function :literal
 end
 
 Symbol.send(:include, Flounder::SymbolExtensions)

data/qed/applique/ae.rb

@@ -2,6 +2,6 @@ require 'ae'
 
 def generates_sql(expected)
   -> (given) {
-    given.to_sql.gsub(/^SELECT.*FROM/, 'SELECT [fields] FROM').assert == expected
+    given.to_sql.gsub(/^SELECT.*?FROM/, 'SELECT [fields] FROM').assert == expected
   }
 end

data/qed/index.md

@@ -63,6 +63,13 @@ Fields can be used fully qualified by going through the entity.
   assert generates_sql("SELECT [fields] FROM \"users\"  WHERE \"users\".\"user_id\" = \"users\".\"approver_id\"")
 ~~~
 
+By default, symbols are interpreted as field names in the entity that you start your query with. But you can localize your `#where` clause to any other entity. 
+
+~~~ruby
+  users.where(posts, :id => 1).
+    assert generates_sql("SELECT [fields] FROM \"users\"  WHERE \"posts\".\"id\" = 1")
+~~~
+
 # Some JOINs
 
 Here are some non-crazy joins that also work. 

data/qed/selects.md

@@ -44,3 +44,23 @@ You can treat the entities and the queries like an array.
   query = entity.where(:id => :id)
   query.size.assert == entity.size
 ~~~
+
+# Subqueries
+
+Sometimes you have to say it with a subquery. For example, you might want to look at the latest post for each author in the database. 
+
+~~~ruby
+  last_post = posts.
+    project(:id).
+    order_by(:id.desc). # for lack of timestamps, not as a best practice
+    where(:approver_id => domain[:users][:id]).limit(1)
+
+  query = domain[:users].
+    join(posts).on(:id => :user_id, posts[:id] => last_post)
+
+  query.assert generates_sql(%Q(SELECT [fields] FROM "users" INNER JOIN "posts" ON "posts"."id" = (SELECT  "posts"."id" FROM "posts"  WHERE "posts"."approver_id" = "users"."id"  ORDER BY "posts"."id" DESC LIMIT 1)))
+
+  row = query.first
+  row.post.id.assert == 1
+~~~
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -92,6 +92,7 @@ files:
 - HISTORY
 - LICENSE
 - README
+- flounder-0.9.4.gem
 - flounder.gemspec
 - lib/flounder.rb
 - lib/flounder/connection.rb