flounder 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e50bc0d92b9351ee20f0dbf9ca3881acf3c58a7
-  data.tar.gz: 45da1bd52d62d5fd874f45788564d068e1c47e3a
+  metadata.gz: 7f8e5bfe7c23126db0ec99a746217736f7e45577
+  data.tar.gz: d69fc270320c38da007f28e1bb8a426e000dd828
 SHA512:
-  metadata.gz: 87dfe61309ca308686f916ad8475649210720162d660426a6dbaf43dde7e23d8be1c3bc4ce893a901a3623157bc8a2127ff4a52b1f97b9f1f04e5748f5e9bce4
-  data.tar.gz: 067d2ef4f6e7adc18e4a1c9a4ef1b5c11ce0bcc00d7ad95648776cccbbcfaf0835e2f995dfa9aec8a633aa2d1cec2cec6354194bcc552ae0400d66da4cbd37a9
+  metadata.gz: cadf55075780bd232fdae1b7aecf695d6a7772f439a696c04ad93b30562ed9e664d781cdfb0e5a4eb5c411eeaccc015b564b0413a25b59abbd3cdfd588de8b2c
+  data.tar.gz: 24b28594cd17524a688982771b87864bf9de0bb9009aa2b93fedf36b09e5ad3e223432e50a8fa03b4f65a4aea1a36eb1c39085521d43c6a74f806c360a2aa6bd

data/Gemfile.lock

@@ -0,0 +1,33 @@
+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

data/HISTORY

@@ -20,5 +20,4 @@
 
  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.5'
+  s.version  = '0.9.6'
   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,22 +31,12 @@ 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(resolve_entity, k, v))
+          manager.where(transform_tuple(k, v))
         end
         return self
       end
@@ -135,31 +125,21 @@ module Flounder::Query
     #  * #where
     #  * #on
     #
-    def transform_tuple entity, field, value
+    def transform_tuple 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, entity[field].arel_field, value)
+          join_and_condition_part(entity[field].arel_field, value)
         # covers: entity[:field] => ...
         when Flounder::Field
-          join_and_condition_part(entity, field.arel_field, value)
+          join_and_condition_part(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)
@@ -167,7 +147,7 @@ module Flounder::Query
         fail "Could not transform condition part. (#{field.inspect}, #{value.inspect})"
       end
     end
-    def join_and_condition_part entity, arel_field, value, kind=:eq
+    def join_and_condition_part arel_field, value, kind=:eq
       case value
         # covers subselects
         when Flounder::Query::Base

data/lib/flounder/query/select.rb

@@ -31,6 +31,10 @@ 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
@@ -66,7 +70,7 @@ module Flounder::Query
     def on join_conditions
       join_conditions.each do |k, v|
         manager.on(
-          transform_tuple(entity, k, join_field(v)))
+          transform_tuple(k, join_field(v)))
       end
       self
     end

data/lib/flounder.rb

@@ -31,11 +31,6 @@ 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/index.md

@@ -63,13 +63,6 @@ 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. 
@@ -82,6 +75,16 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -88,11 +88,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - HACKING
 - HISTORY
 - LICENSE
 - README
-- flounder-0.9.4.gem
 - flounder.gemspec
 - lib/flounder.rb
 - lib/flounder/connection.rb