pggraphql 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fea48a5522b0f0f471725feb12317d463f78cd6
-  data.tar.gz: f9475b2bb5ee21271dd7b3695cde9ca35f0b2f32
+  metadata.gz: 4b016ad8dffbdb2b014ec63cb6b4f2f730a2a514
+  data.tar.gz: 2f99620927aa7043a7130156596dcfd9f1f2d2d1
 SHA512:
-  metadata.gz: eb7ac6feeff8448154dd3b4dbde792e9df29e901d2756f459e2325027857d9d783ea11f84b6ccb6e2988c4cec6fc1a78dd0c36b29406a80b79e1eb41e7ae771a
-  data.tar.gz: a050ca27622558a21c81e9199922bee8c2efef2ff2343dda8d735ad95d668ad430b8224f91a366ad6e548e4c8118bd3af1b02b88f39b036763533fd0c9e62432
+  metadata.gz: d7637666111ab189bcd497da5837d5d06e3baf89c0716839481294c160d6a0ca13531de7c2e4ae71ad7e54f12dd55cbf55578736ffe1fddabefff4743bd11703
+  data.tar.gz: dbbdc73800151b6ac3bf6e3535245d412c38ca7f1843fe8c27eabbe14bdbc57b687229c1edac9bab220d5fa03ae5290e9b1f489dd548695da9898be136e5a901

data/lib/pggraphql/version.rb

@@ -1,3 +1,3 @@
 module Pggraphql
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/pggraphql.rb

@@ -116,10 +116,11 @@ module PgGraphQl
         @mappings = {}
         @null_pk = false
         @pk = ->(ids) do
+          id_column = @mappings[:id] || "id"
           if ids.is_a?(Array)
-            "id in (" + ids.map{|id| id.is_a?(String) ? "'#{id}'" : id.to_s}.join(',') + ")"
+            "#{id_column} in (" + ids.map{|id| id.is_a?(String) ? "'#{id}'" : id.to_s}.join(',') + ")"
           else
-            "id = " + (ids.is_a?(String) ? "'#{ids}'" : "#{ids}")
+            "#{id_column} = " + (ids.is_a?(String) ? "'#{ids}'" : "#{ids}")
           end
         end
       end

data/test/test_pggraphql.rb

@@ -290,6 +290,32 @@ module PgGraphQl
       
     end
 
+    def test_inherit_with_pk
+      res = to_sql({
+        products: {
+          id: 1,
+          clickout__destination_url: nil
+        }
+      }) do |s|
+        s.root :product
+        s.type :product, null_pk: :array, fields: [:type, :clickout__destination_url, :download__download_url] do |t|
+          t.map :id, "products.id"
+          t.subtype :clickout, table: :product_clickouts, fk: "clickout.id = products.id and products.type = 'clickout'"
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'products'::text as key,
+          (select to_json(x.*)
+            from (select products.id as id,
+                  clickout.destination_url as clickout__destination_url
+                from products
+                left join product_clickouts as clickout on (clickout.id = products.id
+                    and products.type = 'clickout') where products.id = 1 limit 1) x) as value
+      SQL
+      ), token(res)
+      
+    end
 
     #####################
     # one

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pggraphql
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jan Zimmek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json