pggraphql 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60ab99d71efd2955788a1616ec4c8a3ebcbe971a
-  data.tar.gz: ec9403901a2fa867d64e08954ff2a69a181df330
+  metadata.gz: 740c71df80baf59979c79d246a8956a8381bada1
+  data.tar.gz: 86c5e60636bc5f3d28c210f096ed7684f2a62905
 SHA512:
-  metadata.gz: 79b377023aa0b3df1297fce755f8a7139ea41055f053099f2d30e1949789e8b7ea34f62fcb68a2b540d63d547d92baef62e8830134ece865f47863f08793c7f2
-  data.tar.gz: 07f8413aaf1fc7ea03c7f82db48330d7bd18f561c41f7e1f8985e2f373a4b13d8526064045967245b2c4cc9854db20684766744f70f5aaef19265bf02d050dae
+  metadata.gz: 40b4f96fc5588dacf2ee4d5810f654f54bfc16c36139bba646dfad743488429712b07c48cdcc7cd3d60e31be29d6a64222734b9cf8078c928b20c1aad8b4fb15
+  data.tar.gz: 8e073df1c7d2f6d7050520b843e1999256a13e58eed043d17b97398d132959e7ba7047673c727380bb115715d06484f6519049d4fabc7ad1800c5ec2b18dd8ec

data/lib/pggraphql/version.rb

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

data/lib/pggraphql.rb

@@ -45,17 +45,32 @@ module PgGraphQl
             nested_link_name = f[0]
             field_name = f[0]
 
-            raise "unknown field #{field_name.inspect} on type #{type.name.inspect}" if !f[1].is_a?(Hash) && !type.fields.include?(field_name)
+            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)
 
-            column_name = field_name.to_s.index("__") ? field_name.to_s.gsub(/__/, ".").to_sym : field_name
+            if f[1].is_a?(Hash)
+              "(" + to_sql([f].to_h, level + 1, type, nested_link_name) + ") as #{field_name}"
+            else
+              field_def = type.fields.detect{|f| f[:name] == field_name}
 
-            column_expr = type.mappings[field_name] || column_name
+              column_name = field_def[:name].to_s.index("__") ? field_def[:name].to_s.gsub(/__/, ".").to_sym : field_def[:name]
+              # column_expr = type.mappings[field_name] || column_name
+
+              column_expr = if field_def[:expr]
+                field_def[:expr].call(column_name)
+              else
+                column_name
+              end
+
+              if (column_name == field_name && column_name == column_expr)
+                column_name.to_s
+              else
+                "#{column_expr}" + (field_def[:as] ? " as #{field_def[:as]}" : "")
+              end
+            end
 
-            (f[1].is_a?(Hash) ? "(" + to_sql([f].to_h, level + 1, type, nested_link_name) + ") as #{field_name}" : ((column_name == field_name && column_name == column_expr) ? column_name.to_s : "#{column_expr} as #{field_name}"))
           end.join(",")
 
-          # is_many = (link && link.many?) || ids.is_a?(Array) || (level == 1 && !ids && type.null_pk == :array)
           is_many = (link && link.many?) || (level == 1 && ids.is_a?(Array)) || (level == 1 && !ids && type.null_pk == :array)
           order_by = link.try(:order_by) || type.try(:order_by)
 
@@ -117,10 +132,9 @@ module PgGraphQl
         @order_by = nil
         @links = {}
         @subtypes = {}
-        @mappings = {}
         @null_pk = false
         @pk = ->(ids, level) do
-          id_column = @mappings[:id] || "id"
+          id_column = "#{@table}.id"
           if ids.is_a?(Array)
             "#{id_column} in (" + ids.map{|id| id.is_a?(String) ? "'#{id}'" : id.to_s}.join(',') + ")"
           else
@@ -129,14 +143,26 @@ module PgGraphQl
         end
       end
       def fields=(fields)
-        @fields = fields
+        fields.each do |f|
+          raise "do not add :id in fields; it will be added automatically" if f == :id || (f.is_a?(Hash) && f[:name] == :id)
+        end
+        @fields = fields.map{|f| create_field(f)}
       end
       def fields
-        @fields + [:id] + (@subtypes.empty? ? [] : [:type])
+        @fields + [create_field({name: :id, as: nil, expr: ->(c){ "#{@table}.#{c}" }})] + (@subtypes.empty? ? [] : [create_field(:type)])
       end
-      def map(field, column_expr)
-        @mappings[field] = column_expr
+      def create_field(field)
+        if field.is_a?(Symbol)
+          {name: field, as: field}
+        elsif field.is_a?(Hash)
+          raise "missing field :name #{field.inspect}" unless field[:name]
+          field[:as] = field[:name] unless field.key?(:as)
+          field
+        else
+          raise "unsupported field #{field.inspect}"
+        end         
       end
+
       def one(name, opts={})
         create_link(name, false, opts)
       end

data/test/test_pggraphql.rb

@@ -23,16 +23,16 @@ module PgGraphQl
     def test_simple
       res = to_sql({user: {id: 1, email: "email"}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email]
+        s.type :user, fields: [:email]
       end
 
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email
                 from users
-                where id = 1 limit 1) x) as value      
+                where users.id = 1 limit 1) x) as value      
       SQL
       ), token(res)
 
@@ -46,10 +46,10 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email
                 from users
-                where id = 1 limit 1) x) as value      
+                where users.id = 1 limit 1) x) as value      
       SQL
       ), token(res)
 
@@ -63,7 +63,7 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select id,
+            from (select users.id,
                   email
                 from users) x) as value      
       SQL
@@ -73,6 +73,15 @@ module PgGraphQl
     def test_simple_fail_when_accessing_non_root
       assert_raise_message ":user is not a root type" do
         res = to_sql({user: {id: 1, email: "email"}}) do |s|
+          s.type :user, fields: [:email]
+        end
+      end
+    end
+
+    def test_simple_fail_when_pass_id_field
+      assert_raise_message "do not add :id in fields; it will be added automatically" do
+        res = to_sql({user: {id: 1, email: "email"}}) do |s|
+          s.root :user
           s.type :user, fields: [:id, :email]
         end
       end
@@ -82,14 +91,14 @@ module PgGraphQl
       assert_raise_message "missing :id for root type :user" do
         res = to_sql({user: {email: "email"}}) do |s|
           s.root :user
-          s.type :user, fields: [:id, :email]
+          s.type :user, fields: [:email]
         end
       end
 
       assert_raise_message "found empty :id array on type :user" do
         res = to_sql({user: {id: [], email: "email"}}) do |s|
           s.root :user
-          s.type :user, fields: [:id, :email]
+          s.type :user, fields: [:email]
         end
       end
     end
@@ -103,7 +112,7 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email
                 from users where access_token = '1' limit 1) x) as value
       SQL
@@ -119,7 +128,7 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email
                 from users where level1 = '99' limit 1) x) as value
       SQL
@@ -135,12 +144,13 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select id,
+            from (select users.id,
                   email
-                from users where id in ('1')) x) as value      
+                from users where users.id in ('1')) x) as value      
       SQL
       ), token(res)
 
+      # ---
 
       res = to_sql({user: {id: "1", email: "email"}}) do |s|
         s.root :user
@@ -150,9 +160,9 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email
-                from users where id = '1' limit 1) x) as value      
+                from users where users.id = '1' limit 1) x) as value      
       SQL
       ), token(res)
     end
@@ -160,15 +170,15 @@ module PgGraphQl
     def test_simple_pk_array_one
       res = to_sql({user: {id: [1], email: "email"}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email]
+        s.type :user, fields: [:email]
       end
 
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select id,
+            from (select users.id,
                   email
-                from users where id in (1)) x) as value      
+                from users where users.id in (1)) x) as value      
       SQL
       ), token(res)
     end
@@ -176,15 +186,15 @@ module PgGraphQl
     def test_simple_pk_array_multiple
       res = to_sql({user: {id: [1,2], email: "email"}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email]
+        s.type :user, fields: [:email]
       end
 
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select id,
+            from (select users.id,
                   email
-                from users where id in (1,2)) x) as value      
+                from users where users.id in (1,2)) x) as value      
       SQL
       ), token(res)
 
@@ -192,15 +202,15 @@ module PgGraphQl
 
       res = to_sql({user: {id: ['1','2'], email: "email"}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email]
+        s.type :user, fields: [:email]
       end
 
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select id,
+            from (select users.id,
                   email
-                from users where id in ('1','2')) x) as value      
+                from users where users.id in ('1','2')) x) as value      
       SQL
       ), token(res)
     end
@@ -208,16 +218,16 @@ module PgGraphQl
     def test_simple_filter
       res = to_sql({user: {id: 1, email: "email"}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email], filter: "id > 100"
+        s.type :user, fields: [:email], filter: "id > 100"
       end
 
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email
                 from users
-                where id = 1 and (id > 100) limit 1) x) as value      
+                where users.id = 1 and (id > 100) limit 1) x) as value      
       SQL
       ), token(res)
     end
@@ -226,26 +236,86 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email"}, educator: {id: 99}}) do |s|
         s.root :user
         s.root :educator
-        s.type :user, fields: [:id, :email]
+        s.type :user, fields: [:email]
         s.type :educator, null_pk: true
       end
 
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
         union all
         select 'educator'::text as key,
           (select to_json(x.*)
-            from (select id
-                from educators where id = 99 limit 1) x) as value
+            from (select educators.id
+                from educators where educators.id = 99 limit 1) x) as value
       SQL
       ), token(res)
     end
 
+    def test_simple_strange_nested_to_json_for_json_datatype_with_column_alias
+      # fails: select 'flow'::text as key, (select to_json(x.*) from (select id, data from flows where id = '1' limit 1) x) as value;
+      # fine: select 'flow'::text as key, (select to_json(x.*) from (select id, to_json(data) from flows where id = '1' limit 1) x) as value;
+
+      res = to_sql({flow: {id: 1, data: nil}}) do |s|
+        s.root :flow
+        s.type :flow do |t|
+          t.fields = [{name: :data}]
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'flow'::text as key, (select to_json(x.*) from (select flows.id, data from flows where flows.id = 1 limit 1) x) as value
+      SQL
+      ), token(res)
+
+      # ------
+
+      res = to_sql({flow: {id: 1, data: nil}}) do |s|
+        s.root :flow
+        s.type :flow do |t|
+          t.fields = [{name: :data, as: nil}]
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'flow'::text as key, (select to_json(x.*) from (select flows.id, data from flows where flows.id = 1 limit 1) x) as value
+      SQL
+      ), token(res)
+
+      # ------
+
+      res = to_sql({flow: {id: 1, data: nil}}) do |s|
+        s.root :flow
+        s.type :flow do |t|
+          t.fields = [{name: :data, expr: ->(c){ "to_json(#{c})" } }]
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'flow'::text as key, (select to_json(x.*) from (select flows.id, to_json(data) as data from flows where flows.id = 1 limit 1) x) as value
+      SQL
+      ), token(res)
+
+      # ------ positive check
+
+      res = to_sql({flow: {id: 1, data: nil}}) do |s|
+        s.root :flow
+        s.type :flow do |t|
+          t.fields = [{name: :data, as: nil, expr: ->(c){ "to_json(#{c})" } }]
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'flow'::text as key, (select to_json(x.*) from (select flows.id, to_json(data) from flows where flows.id = 1 limit 1) x) as value
+      SQL
+      ), token(res)
+
+    end
+
     #####################
     # inherit
     #####################
@@ -263,7 +333,7 @@ module PgGraphQl
       }) do |s|
         s.root :product
 
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.many :orders, fk: "user_id = users.id"
         end
 
@@ -271,8 +341,6 @@ module PgGraphQl
 
         s.type :product, null_pk: :array, fields: [:type, :clickout__destination_url, :download__download_url] do |t|
 
-          t.map :id, "products.id"
-
           t.subtype :download, table: :product_downloads, fk: "download.id = products.id and products.type = 'download'"
           t.subtype :clickout, table: :product_clickouts, fk: "clickout.id = products.id and products.type = 'clickout'"
 
@@ -284,14 +352,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'products'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select products.id as id,
+            from (select products.id,
                   type,
                   clickout.destination_url as clickout__destination_url,
                   download.download_url as download__download_url,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select id,
+                    from (select users.id,
                           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                            from (select id
+                            from (select orders.id
                                 from orders
                                 where (user_id = users.id)) x) as orders
                         from users
@@ -302,8 +370,7 @@ module PgGraphQl
                 left join product_clickouts as clickout on (clickout.id = products.id
                     and products.type = 'clickout')) x) as value
       SQL
-      ), token(res)
-      
+      ), token(res)      
     end
 
     def test_inherit_with_pk
@@ -315,7 +382,6 @@ module PgGraphQl
       }) do |s|
         s.root :product
         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
       end
@@ -323,7 +389,7 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'products'::text as key,
           (select to_json(x.*)
-            from (select products.id as id, type,
+            from (select products.id, type,
                   clickout.destination_url as clickout__destination_url
                 from products
                 left join product_clickouts as clickout on (clickout.id = products.id
@@ -341,7 +407,7 @@ module PgGraphQl
     def test_link_one
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.one :address, fk: "id = users.address_id"
         end
         s.type :address
@@ -350,14 +416,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(x.*)
-                    from (select id
+                    from (select addresses.id
                         from addresses
-                        where id = '99' and (id = users.address_id) limit 1) x) as address
+                        where addresses.id = '99' and (id = users.address_id) limit 1) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
@@ -365,7 +431,7 @@ module PgGraphQl
     def test_link_one_nested_pk
       res = to_sql({user: {id: 1, email: "email", address: {id: 99}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.one :address, fk: "id = users.address_id"
         end
         s.type :address
@@ -374,20 +440,20 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(x.*)
-                    from (select id
+                    from (select addresses.id
                         from addresses
-                        where id = 99 and (id = users.address_id) limit 1) x) as address
+                        where addresses.id = 99 and (id = users.address_id) limit 1) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
 
       res = to_sql({user: {id: 1, email: "email", address: {id: [99,999]}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.one :address, fk: "id = users.address_id"
         end
         s.type :address
@@ -396,16 +462,17 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(x.*)
-                    from (select id
+                    from (select addresses.id
                         from addresses
-                        where id in (99,999) and (id = users.address_id) limit 1) x) as address
+                        where addresses.id in (99,999) and (id = users.address_id) limit 1) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
-      ), token(res)    end
+      ), token(res)    
+    end
 
     def test_link_one_empty_fields
       res = to_sql({user: {id: 1, email: "email", address: {}}}) do |s|
@@ -419,14 +486,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(x.*)
-                    from (select id
+                    from (select addresses.id
                         from addresses
                         where (id = users.address_id) limit 1) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
@@ -435,7 +502,7 @@ module PgGraphQl
       assert_raise_message "missing :fk on link :address" do
         to_sql({user: {id: 1, email: "email", address: {id: "id"}}}) do |s|
           s.root :user
-          s.type :user, fields: [:id, :email] do |t|
+          s.type :user, fields: [:email] do |t|
             t.one :address
           end
           s.type :address
@@ -447,7 +514,7 @@ module PgGraphQl
     def test_link_one_fk_sql
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.one :address, fk: "id = (select 100)"
         end
         s.type :address
@@ -456,14 +523,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(x.*)
-                    from (select id
+                    from (select addresses.id
                         from addresses
-                        where id = '99' and (id = (select 100)) limit 1) x) as address
+                        where addresses.id = '99' and (id = (select 100)) limit 1) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
@@ -471,7 +538,7 @@ module PgGraphQl
     def test_link_one_filter
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.one :address, fk: "user_id = users.id", filter: "id > 100"
         end
         s.type :address
@@ -480,14 +547,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(x.*)
-                    from (select id
+                    from (select addresses.id
                         from addresses
-                        where id = '99' and (user_id = users.id) and (id > 100) limit 1) x) as address
+                        where addresses.id = '99' and (user_id = users.id) and (id > 100) limit 1) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
@@ -495,7 +562,7 @@ module PgGraphQl
     def test_link_one_order_by
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.one :address, fk: "user_id = users.id", order_by: "id desc"
         end
         s.type :address
@@ -504,14 +571,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(x.*)
-                    from (select id
+                    from (select addresses.id
                         from addresses
-                        where id = '99' and (user_id = users.id) order by id desc limit 1) x) as address
+                        where addresses.id = '99' and (user_id = users.id) order by id desc limit 1) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
@@ -523,7 +590,7 @@ module PgGraphQl
     def test_link_one_in_one
       res = to_sql({user: {id: 1, email: "email", address: {country: {}}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.one :address, fk: "user_id = users.id"
         end
         s.type :address do |t|
@@ -535,31 +602,31 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(x.*)
-                    from (select id,
+                    from (select addresses.id,
                           (select to_json(x.*)
-                            from (select id
+                            from (select countries.id
                                 from countries
                                 where (id = addresses.country_id) limit 1) x) as country
                         from addresses
                         where (user_id = users.id) limit 1) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
 
-    #####################
-    # many
-    #####################
+    # #####################
+    # # many
+    # #####################
 
 
     def test_link_many
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.many :address, fk: "user_id = users.id"
         end
         s.type :address
@@ -568,14 +635,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select id
+                    from (select addresses.id
                         from addresses
-                        where id = '99' and (user_id = users.id)) x) as address
+                        where addresses.id = '99' and (user_id = users.id)) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
@@ -583,7 +650,7 @@ module PgGraphQl
     def test_link_many_nested_pk
       res = to_sql({user: {id: 1, email: "email", address: {id: ["99","999"]}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.many :address, fk: "user_id = users.id"
         end
         s.type :address
@@ -592,14 +659,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select id
+                    from (select addresses.id
                         from addresses
-                        where id in ('99','999') and (user_id = users.id)) x) as address
+                        where addresses.id in ('99','999') and (user_id = users.id)) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
@@ -607,7 +674,7 @@ module PgGraphQl
     def test_link_many_empty_fields
       res = to_sql({user: {id: 1, email: "email", address: {}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.many :address, fk: "user_id = users.id"
         end
         s.type :address
@@ -616,14 +683,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select id
+                    from (select addresses.id
                         from addresses
                         where (user_id = users.id)) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
@@ -631,7 +698,7 @@ module PgGraphQl
     def test_link_many_filter
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.many :address, fk: "user_id = users.id", filter: "id % 2 = 0"
         end
         s.type :address
@@ -640,14 +707,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select id
+                    from (select addresses.id
                         from addresses
-                        where id = '99' and (user_id = users.id) and (id % 2 = 0)) x) as address
+                        where addresses.id = '99' and (user_id = users.id) and (id % 2 = 0)) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
@@ -655,7 +722,7 @@ module PgGraphQl
     def test_link_many_order_by
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email] do |t|
+        s.type :user, fields: [:email] do |t|
           t.many :address, fk: "user_id = users.id", order_by: "id desc"
         end
         s.type :address
@@ -664,14 +731,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select id,
+            from (select users.id,
                   email,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select id
+                    from (select addresses.id
                         from addresses
-                        where id = '99' and (user_id = users.id) order by id desc) x) as address
+                        where addresses.id = '99' and (user_id = users.id) order by id desc) x) as address
                 from users
-                where id = 1 limit 1) x) as value
+                where users.id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end

metadata

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