pggraphql 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b04ff239be18d90b85971b13eb3f7722a28de47a
-  data.tar.gz: 360719c079f33dd65b4ddaebd4fd87bc95782b50
+  metadata.gz: 1435a943bfa68882db3826bb0f70561db6ad90cb
+  data.tar.gz: 9efca16a8d0c08f171162645661b541248cc70bb
 SHA512:
-  metadata.gz: 90fd83702b235304dd8c60981f7a0521e20cecb1e26b3df3b07a5b6d8ef86d56038f201f1d8b9f884975ad24e4d294f85f1c40e3286a7eaf4a675a3d5e3c247b
-  data.tar.gz: 32d51411460608e6a375d3e198201b43b0c211afbba68bb9c1a7b58edfb63d8ad8824138fd449804cd2755197123b4e69e2eb76031ad3bf6ddc5f15f095feab1
+  metadata.gz: 592df918ac04b3f7c4b1201c0c2d7088f5888296a62d968a041a98fd99463a1dac132f466fb1c76ae4e5536595687674aab8082221f91be40fd9a4a88a5bb59f
+  data.tar.gz: 4bf4ac82696eb398dba7752a92f2605ebfa5d3c17daf3011fcd895e388ba369565803a29e6de06bddac3554555321aff32bd63cb697b03df59085b4559d77ab5

data/lib/pggraphql/version.rb

@@ -1,3 +1,3 @@
 module Pggraphql
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/pggraphql.rb

@@ -38,8 +38,8 @@ module PgGraphQl
     def to_sql(query, level=0, params=[], parent=nil, link_name=nil)
       if level > 0
         query.map do |e|
-          link = parent ? parent.links[link_name] : nil
-          type = link ? link.type : self.types[e[0].to_s.singularize.to_sym]
+          link = parent ? parent.links[link_name.to_s.split("@").first.to_sym] : nil
+          type = link ? link.type : self.types[e[0].to_s.split("@").first.singularize.to_sym]
           ids = e[1][:id]
 
           raise "found :id with without value on type #{type.name.inspect}" if e[1].key?(:id) && ids.nil?
@@ -58,10 +58,10 @@ module PgGraphQl
             field_name = f[0]
 
             raise "unknown field #{field_name.inspect} on type #{type.name.inspect}" if !f[1].is_a?(Hash) && !type.fields.detect{|f| f[:name] == field_name}
-            raise "unknown link #{field_name.inspect} on type #{type.name.inspect}" if f[1].is_a?(Hash) && !type.links.include?(field_name)
+            raise "unknown link #{field_name.inspect} on type #{type.name.inspect}" if f[1].is_a?(Hash) && !type.links.include?(field_name.to_s.split("@").first.to_sym)
 
             if f[1].is_a?(Hash)
-              "(" + to_sql([f].to_h, level + 1, params, type, nested_link_name) + ") as #{field_name}"
+              "(" + to_sql([f].to_h, level + 1, params, type, nested_link_name) + ") as \"#{field_name}\""
             else
               field_def = type.fields.detect{|f| f[:name] == field_name}
 

data/test/test_pggraphql.rb

@@ -382,9 +382,9 @@ module PgGraphQl
                           (select to_json(coalesce(json_agg(x.*), '[]'::json))
                             from (select orders.id
                                 from orders
-                                where (user_id = users.id)) x) as orders
+                                where (user_id = users.id)) x) as "orders"
                         from users
-                        where (id = download.id)) x) as download__users
+                        where (id = download.id)) x) as "download__users"
                 from products
                 left join product_downloads as download on (download.id = products.id
                     and products.type = 'download')
@@ -444,7 +444,7 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id = ? and (id = users.address_id) limit 1) x) as address
+                        where addresses.id = ? and (id = users.address_id) limit 1) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -469,7 +469,7 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id = ? and (id = users.address_id) limit 1) x) as address
+                        where addresses.id = ? and (id = users.address_id) limit 1) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -492,7 +492,7 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id in ? and (id = users.address_id) limit 1) x) as address
+                        where addresses.id in ? and (id = users.address_id) limit 1) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -517,7 +517,7 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where (id = users.address_id) limit 1) x) as address
+                        where (id = users.address_id) limit 1) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -555,7 +555,7 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id = ? and (id = (select 100)) limit 1) x) as address
+                        where addresses.id = ? and (id = (select 100)) limit 1) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -580,7 +580,7 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id = ? and (user_id = users.id) and (id > 100) limit 1) x) as address
+                        where addresses.id = ? and (user_id = users.id) and (id > 100) limit 1) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -605,7 +605,7 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id = ? and (user_id = users.id) order by id desc limit 1) x) as address
+                        where addresses.id = ? and (user_id = users.id) order by id desc limit 1) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -639,9 +639,9 @@ module PgGraphQl
                           (select to_json(x.*)
                             from (select countries.id
                                 from countries
-                                where (id = addresses.country_id) limit 1) x) as country
+                                where (id = addresses.country_id) limit 1) x) as "country"
                         from addresses
-                        where (user_id = users.id) limit 1) x) as address
+                        where (user_id = users.id) limit 1) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -671,7 +671,7 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select addresses.id
                         from addresses
-                        where addresses.id = ? and (user_id = users.id)) x) as address
+                        where addresses.id = ? and (user_id = users.id)) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -696,7 +696,7 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select addresses.id
                         from addresses
-                        where addresses.id in ? and (user_id = users.id)) x) as address
+                        where addresses.id in ? and (user_id = users.id)) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -721,7 +721,7 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select addresses.id
                         from addresses
-                        where (user_id = users.id)) x) as address
+                        where (user_id = users.id)) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -746,7 +746,7 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select addresses.id
                         from addresses
-                        where addresses.id = ? and (user_id = users.id) and (id % 2 = 0)) x) as address
+                        where addresses.id = ? and (user_id = users.id) and (id % 2 = 0)) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL
@@ -771,7 +771,7 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select addresses.id
                         from addresses
-                        where addresses.id = ? and (user_id = users.id) order by id desc) x) as address
+                        where addresses.id = ? and (user_id = users.id) order by id desc) x) as "address"
                 from users
                 where users.id = ? limit 1) x) as value
       SQL

metadata

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