flounder 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 370d0a1cfd677a805e751dc4532e59b910b06eea
-  data.tar.gz: 49c396164c6dcab26cd99fc5422e9da446875312
+  metadata.gz: f60fabc94bf34a924e2415c6afeef19c98d565c9
+  data.tar.gz: 831d3c9e63fcecc02fc7b82f8814159358341435
 SHA512:
-  metadata.gz: 10b2cc277db56cd71d20e19c1ab1cbd6d69408a9710e1ba48c48f33be90dba2be6bcbd55045babf05a29a6916718f82f86aca471cdfd285281897bbfc8aa9c16
-  data.tar.gz: e691b31f51aa335a3f868650b166d6758e72706e5baea29674002897090b26522da0aac40fa5678d5f6320108dfb5a1baaf4b300faa578a0ef9d63b5e98b53f5
+  metadata.gz: eb48e10532ba0c3febdc3aa57c4d1671ab24b8990c6e16539f11a91971c2ac1fc5e3440ea5e51710fd1a58155bf9903668c5480b87f7cffa1d43bcd04c971a55
+  data.tar.gz: feffebf6cf853a97f1d240c4cebcf482bd9f77084efe6dbdcc38079e3a12dd2cf9c2c13736e9001d22abf04c31f9d3c8bec551c67b75cfed68df6fe82cd0e417

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flounder (0.18.0)
+    flounder (0.18.1)
       aggregate (~> 0.2, >= 0.2.2)
       arel (~> 5, > 5.0.1)
       connection_pool (~> 2)
@@ -18,9 +18,9 @@ GEM
     ansi (1.4.3)
     arel (5.0.1.20140414130214)
     brass (1.2.1)
-    connection_pool (2.0.0)
+    connection_pool (2.1.0)
     facets (2.9.3)
-    hashie (3.3.1)
+    hashie (3.3.2)
     pg (0.17.1)
     pg-hstore (1.2.0)
     qed (2.9.1)

data/HISTORY

@@ -1,5 +1,6 @@
 # 0.18
   + Allows usage of relation names in where clauses.
+  + Remaps entity oids automatically if a mismatch exists.
 
 # 0.17 
   + A call to order_by fully replaces previously set ordering.

data/flounder.gemspec

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

@@ -22,8 +22,13 @@ module Flounder
       @plural = {}
       @singular = {}
 
+      # Maps table names to entities
+      @entity_by_table_name = {}
+
       # maps OIDs of entities to entities
-      @oids_entity_map = {}
+      @oids_entity_map = Hash.new { |hash, oid|
+        hash[oid] = entity_from_oid(oid)
+      }
 
       @logger = Logger.new(NilDevice.new)
 
@@ -109,11 +114,12 @@ module Flounder
       entity = Entity.new(self, plural, singular, table_name).
         tap { |e| yield e if block_given? }
 
+      raise ArgumentError, "Table #{table_name} was already associated with an entity." \
+        if @entity_by_table_name.has_key?(table_name)
+
       @plural[plural] = entity
       @singular[singular] = entity
-
-      # Also maps OID to entities for field resolution
-      @oids_entity_map[table_oid(table_name)] = entity
+      @entity_by_table_name[table_name] = entity
 
       entity
     end
@@ -121,6 +127,7 @@ module Flounder
     # Returns an entity by table oid.
     #
     def by_oid oid
+      return nil if oid==0 # computed fields
       @oids_entity_map[oid]
     end
 
@@ -157,11 +164,12 @@ module Flounder
       end
     end
 
-    def table_oid table_name
+    def entity_from_oid oid
       connection_pool.with_connection do |conn|
-        # TBD
-        conn.exec(%Q(select oid from pg_class where relname = #{conn.quote(table_name)})).
-          getvalue(0,0).to_i        
+        table_name = conn.exec(%Q(SELECT #{oid}::regclass)).
+          getvalue(0,0)
+
+        @entity_by_table_name[table_name]
       end
     end
   end

data/qed/projection.md

@@ -19,7 +19,7 @@ When projecting, all result data will be toplevel and only the projected data is
     project(users[:name]).first
 
   result.id.assert == nil # Not loaded.
-  result.name.assert == 'John Snow'
+  result.user.name.assert == 'John Snow'
 ~~~
 
 Otherwise a projected query can be treated like an ordinary query, including appending stuff by joining it in. 
@@ -33,3 +33,24 @@ Otherwise a projected query can be treated like an ordinary query, including app
   post.user.name.assert == 'John Snow' 
   post.approver.name.assert == 'John Doe' 
 ~~~
+
+The same (by name) field can be used from multiple tables without issues.
+
+~~~ruby
+  result = posts.
+    join(users).on(:user_id => :id).
+    project(users[:id], users[:name], posts[:id], posts[:title]).
+    first
+
+  result.title.assert == "First Light"
+  result.post.title.assert == "First Light"
+  result.user.name.assert == 'John Snow'
+~~~
+
+Fields that are created during the select are toplevel as well. 
+
+~~~ruby
+  result = posts.project('42 as answer').first
+  result.answer.assert = 42
+~~~
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel