pggraphql 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0b33e3078467161a88af120f37b4de4fc10e127
-  data.tar.gz: eb9f61d5aa769cab705f3d1194227278fbbe585f
+  metadata.gz: 60ab99d71efd2955788a1616ec4c8a3ebcbe971a
+  data.tar.gz: ec9403901a2fa867d64e08954ff2a69a181df330
 SHA512:
-  metadata.gz: bf40ede2fc8a855cf762dfe9052ba58565696cdbf539a446ad7554c2517389feb1292b089aca5bba7454b6c8eec4fec05e8cb15a2ead57fc69751e2692c55bc7
-  data.tar.gz: d970827a05f6af6e537390062ea00fe5443f4e64cf5ce802e2fd06106a5a0227836cb3fe50e4dde05602b7d91d8e5ebd1fe10cf8caa37350cf54de97c0d51fc4
+  metadata.gz: 79b377023aa0b3df1297fce755f8a7139ea41055f053099f2d30e1949789e8b7ea34f62fcb68a2b540d63d547d92baef62e8830134ece865f47863f08793c7f2
+  data.tar.gz: 07f8413aaf1fc7ea03c7f82db48330d7bd18f561c41f7e1f8985e2f373a4b13d8526064045967245b2c4cc9854db20684766744f70f5aaef19265bf02d050dae

data/lib/pggraphql/version.rb

@@ -1,3 +1,3 @@
 module Pggraphql
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/pggraphql.rb

@@ -37,7 +37,11 @@ module PgGraphQl
           raise "#{type.name.inspect} is not a root type" if level == 1 && !@roots.include?(type)
           raise "missing :fk on link #{link.name.inspect}" if link && !link.fk
 
-          columns = {id: nil}.merge(e[1]).map do |f|
+          requested_fields = {id: nil} # always add :id field
+          requested_fields = requested_fields.merge(type: nil) unless type.subtypes.empty? # always add :subtype
+          requested_fields = requested_fields.merge(e[1])
+
+          columns = requested_fields.map do |f|
             nested_link_name = f[0]
             field_name = f[0]
 
@@ -108,7 +112,7 @@ module PgGraphQl
         @schema = schema
         @name = name
         @table = name.to_s.pluralize.to_sym
-        @fields = [:id]
+        @fields = []
         @filter = nil
         @order_by = nil
         @links = {}
@@ -125,7 +129,10 @@ module PgGraphQl
         end
       end
       def fields=(fields)
-        @fields = (fields + [:id]).uniq
+        @fields = fields
+      end
+      def fields
+        @fields + [:id] + (@subtypes.empty? ? [] : [:type])
       end
       def map(field, column_expr)
         @mappings[field] = column_expr

data/test/test_pggraphql.rb

@@ -314,7 +314,7 @@ module PgGraphQl
         }
       }) do |s|
         s.root :product
-        s.type :product, null_pk: :array, fields: [:type, :clickout__destination_url, :download__download_url] do |t|
+        s.type :product, null_pk: :array, fields: [: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
@@ -323,7 +323,7 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'products'::text as key,
           (select to_json(x.*)
-            from (select products.id as id,
+            from (select products.id as id, type,
                   clickout.destination_url as clickout__destination_url
                 from products
                 left join product_clickouts as clickout on (clickout.id = products.id

metadata

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