flounder 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25d788049bf3f82973544e20b826280ebfd41411
-  data.tar.gz: eb21cf7b82f279de89f198e1badc243a1d727ae3
+  metadata.gz: 0b671fc956d5fcd73817cdc07ec5e9dbd5b03751
+  data.tar.gz: 1a6cf5f585030c036c5bd57abf4450d25103e529
 SHA512:
-  metadata.gz: 00b05e0b4cbbc339bdd90c52c9b9eed8f1ec300a724bce7f587f888e360ed6368fbba2fdc561e0b28aba58da9dd311cbb6c415040fa196c1cc64742a32846cad
-  data.tar.gz: e2e1eac6ce014003b11f009792ad9c4a0a702e485da0730e537df37e55f5abcc3603669a675655ffc2e65a9981e85079de1a15f75dfd8a1f7603c5015b99b7e4
+  metadata.gz: 7803a9083fa04f1f3c0cef3ac9a781f699c55194676e4f362f610a38ff663f3893d07dc1de5da525eaafada13935bbc34c44f56e40218962096790c96e776d69
+  data.tar.gz: 409cd4865b56744ae81129d6cc3eee861fb050c37bcda5943acad18885dca809e1d6c5fb779ce2bc220d33ebcd3171b1e8c84bf81367d92bbf6db827c82221f4

data/HISTORY

@@ -5,19 +5,10 @@
  + You now need to call `#kick` when performing an insert or an update 
    to get it to really happen. Please see our documentation in qed/*.
  + `domain.transaction do |conn| ... end`
-
- 0.9.1
  + `search_path` argument for `Flounder.connect`.
-
- 0.9.2
  + bind variables on INSERT/UPDATE.
-
- 0.9.3
  + DELETE FROM - entity#delete
-
- 0.9.4 
  + nested transactions
-
- 0.9.5
  + subquery support
- 
+ + localized where as in where(entity, :field => value)
+ + db.where(entity, hash) form, where all symbols are looked up in entity. 

data/flounder.gemspec

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

data/lib/flounder/query/select.rb

@@ -31,10 +31,6 @@ module Flounder::Query
     attr_reader :projection_prefixes
 
     def _join join_node, entity
-      if entity.kind_of?(Symbol)
-        entity = domain[entity]
-      end
-
       @last_join = entity
 
       table = entity.table
@@ -70,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

data/lib/flounder/symbol_extensions.rb

@@ -16,8 +16,7 @@ module Flounder
     # NOTE mixing comparison ops with asc and desc is nasty, but not really 
     # relevant. Errors will get raised later on - we're not in the business of 
     # checking your SQL for validity. 
-    [:not_eq, :lt, :gt, :gteq, :lteq, :matches, :in, :not_in,
-      :asc, :desc].each do |kind|
+    [:not_eq, :lt, :gt, :gteq, :lteq, :matches, :asc, :desc].each do |kind|
       define_method kind do
         Modifier.new(self, kind)
       end

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/setup_domain.rb

@@ -22,6 +22,8 @@ end
 #
 # One fine day we will use transactional features.
 #
-File.open File.expand_path '../../qed/flounder.sql' do |file|
+require 'pathname'
+sql = Pathname.new(__FILE__).dirname.join('../..').join('qed/flounder.sql')
+File.open sql do |file|
   Flounder::Engine.new(domain.connection_pool).exec file.read
 end

data/qed/index.md

@@ -46,10 +46,6 @@ Also, several conditions work as one would expect from DataMapper.
     "SELECT [fields] FROM \"users\"  WHERE \"users\".\"id\" >= 10")
   domain[:users].where(:id.not_eq => 10).assert generates_sql( 
     "SELECT [fields] FROM \"users\"  WHERE \"users\".\"id\" != 10")
-  domain[:users].where(:id.in => [1,2,3]).assert generates_sql( 
-    "SELECT [fields] FROM \"users\"  WHERE \"users\".\"id\" IN (1, 2, 3)")
-  domain[:users].where(:id.not_in => [1,2,3]).assert generates_sql( 
-    "SELECT [fields] FROM \"users\"  WHERE \"users\".\"id\" NOT IN (1, 2, 3)")
 ~~~
 
 Fields can be used fully qualified by going through the entity.
@@ -67,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. 
@@ -79,16 +82,6 @@ Here are some non-crazy joins that also work.
     assert generates_sql(%Q(SELECT [fields] FROM "users" LEFT OUTER JOIN "posts" ON "users"."id" = "posts"."user_id"))
 ~~~
 
-Join also accepts symbols as argument - these will be turned into entities. 
-
-~~~ruby
-  domain[:users].join(:posts).on(:id => :user_id).
-    assert generates_sql(%Q(SELECT [fields] FROM "users" INNER JOIN "posts" ON "users"."id" = "posts"."user_id"))
-
-  domain[:users].outer_join(:posts).on(:id => :user_id).
-    assert generates_sql(%Q(SELECT [fields] FROM "users" LEFT OUTER JOIN "posts" ON "users"."id" = "posts"."user_id"))
-~~~
-
 Joining presents an interesting dilemma. There are two ways of joining things together, given three tables. The sequence A.B.C might mean to join A to B and C; it might also be interpreted to mean to join A to B and B to C. Here's how we solve this. 
 
 ~~~ruby

data/qed/selects.md

@@ -56,7 +56,7 @@ Sometimes you have to say it with a subquery. For example, you might want to loo
     where(:approver_id => domain[:users][:id]).limit(1)
 
   query = domain[:users].
-    join(posts).on(:id => :user_id, posts[:id] => last_post)
+    join(posts).on(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)))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -88,12 +88,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - HACKING
 - HISTORY
 - LICENSE
 - README
-- flounder-0.9.6.gem
 - flounder.gemspec
 - lib/flounder.rb
 - lib/flounder/connection.rb

data/Gemfile.lock

@@ -1,33 +0,0 @@
-PATH
-  remote: .
-  specs:
-    flounder (0.8.1)
-      arel (~> 5, > 5.0.1)
-      connection_pool (~> 2)
-      hashie (~> 3, >= 3.2)
-      pg (> 0.17)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ae (1.8.2)
-      ansi
-    ansi (1.4.3)
-    arel (5.0.1.20140414130214)
-    brass (1.2.1)
-    connection_pool (2.0.0)
-    facets (2.9.3)
-    hashie (3.2.0)
-    pg (0.17.1)
-    qed (2.9.1)
-      ansi
-      brass
-      facets (>= 2.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ae
-  flounder!
-  qed