pggraphql 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30009a5c466252f930ace1828c0111d0e6f78fd4
-  data.tar.gz: 51f4d7fdf7d354cc81797c11abf22c3c54a224ee
+  metadata.gz: 80f1221418fdd91945d982eb88b17657d5929222
+  data.tar.gz: 28e9a2d5d4c06083d25784ac758e6707231c4e4f
 SHA512:
-  metadata.gz: 801bdabcbd2cb22177ed107c71a7eb49dbc968f27c10fe25f864d72b0ebb0da580d58daefb86c8921e84263aa9f51f6e9dce684f93417c4015c3b59b0c770d67
-  data.tar.gz: 6a8c862a0bee46b0f4248c795ba64c7814054f507f66962bef395d9b95b2835711574f978f8d168b7c86d8fb41b4a731ac897350856d0087988d54f7834718b9
+  metadata.gz: d9077968f4bd9e50bd49b729460a9a1ed2ffa8dd76ec8826837a99a4b89e5273b957d29810c961fdd8c20c812ad2e515c5eb88e92445915c70c89c897ed4f56d
+  data.tar.gz: 6bdd8bc357ebc7adbe32484f6b6bf6ac71318f2bba1932fb92f1d67047b97f827ec0a7c2dfb448a68395618c2f79240815a2c64355aba409a22ff3ce52bf14cf

data/lib/pggraphql/version.rb

@@ -1,3 +1,3 @@
 module Pggraphql
-  VERSION = "0.0.15"
+  VERSION = "0.1.0"
 end

data/lib/pggraphql.rb

@@ -24,8 +24,8 @@ module PgGraphQl
       yield(type) if block_given?
     end
 
-    def handle_sql_part(part, params)
-      if part.is_a?(Array)
+    def handle_sql_part(part, params, level, table_levels)
+      next_part = if part.is_a?(Array)
         part.slice(1..-1).each{|param| params << param}
         part[0]
       elsif part.is_a?(String)
@@ -33,9 +33,38 @@ module PgGraphQl
       else
         raise "unsupported sql part: #{part}"
       end
+
+      next_part.gsub(/\{([^}]+)\}/) do
+        m = Regexp.last_match[1]
+
+        table_name, arg = m.split(":")
+        table_name = table_name.to_sym
+
+        sql_part = if arg =~ /-1$/
+          "#{table_name}#{level-1}"
+        elsif arg == "root"
+          "#{table_name}1"
+        elsif arg == "closest"
+          table_level_arr = table_levels[table_name]
+
+          raise "table #{table_name} not visited in table_levels" unless table_level_arr
+          closest_table_level = table_level_arr[table_level_arr.length - 1]
+
+          closest_table_level = closest_table_level - 1 if closest_table_level == level
+
+          "#{table_name}#{closest_table_level}"
+        else
+          "#{table_name}#{level}"
+        end
+
+        table_levels[table_name] = [] unless table_levels[table_name]
+        table_levels[table_name] << level unless table_levels[table_name].include?(level)
+
+        sql_part
+      end
     end
 
-    def to_sql(query, level=0, params=[], parent=nil, link_name=nil)
+    def to_sql(query, level=0, params=[], table_levels={}, parent=nil, link_name=nil)
       if level > 0
         query.map do |e|
           link = parent ? parent.links[link_name.to_s.split("@").first.to_sym] : nil
@@ -63,24 +92,27 @@ module PgGraphQl
             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, table_levels, type, nested_link_name) + ") as \"#{field_name}\""
             else
               field_def = type.fields.detect{|f| f[:name] == field_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]
-                handle_sql_part(field_def[:expr].call(column_name), params)
+              column_name = if field_def[:name].to_s.index("__")
+                field_def[:name].to_s.gsub(/(.*?)__(.*?)/, "{\\1}.\\2").to_sym
               else
-                column_name
+                field_def[:name]
+              end
+              
+              unless column_name.to_s.index(".")
+                column_name = :"{#{type.table}}.#{column_name}"
               end
 
-              if (column_name == field_name && column_name == column_expr)
-                column_name.to_s
+              column_expr = if field_def[:expr]
+                handle_sql_part(field_def[:expr].call(column_name), params, level, table_levels)
               else
-                "#{column_expr}" + (field_def[:as] ? " as #{field_def[:as]}" : "")
+                handle_sql_part("#{column_name}", params, level, table_levels)
               end
+
+              "#{column_expr}" + (field_def[:as] ? " as #{field_def[:as]}" : "")
             end
 
           end.join(",")
@@ -93,10 +125,10 @@ module PgGraphQl
           raise "missing :id for root type #{type.name.inspect}" if !ids && level == 1 && !type.null_pk
 
           if ids && type.pk.call(ids, level)
-            wheres << handle_sql_part(type.pk.call(ids, level), params)
+            wheres << handle_sql_part(type.pk.call(ids, level), params, level, table_levels)
           end
 
-          wheres << ("(" + handle_sql_part(type.filter, params) + ")") if type.filter
+          wheres << ("(" + handle_sql_part(type.filter, params, level, table_levels) + ")") if type.filter
 
           if link
             fk = link.fk.is_a?(Proc) ? link.fk.call(level) : link.fk
@@ -104,48 +136,49 @@ module PgGraphQl
             if link_name.to_s.index("__")
               subtype_type, subtype_link_name = link_name.to_s.split("__")
 
-              fk = "#{link.type.table}.id = #{subtype_type}.#{subtype_link_name}_id" if fk == :belongs_to
-              fk = "#{link.type.table}.#{parent.name}_id = #{subtype_type}.id" if fk == :has_one
-              fk = "#{link.type.table}.#{parent.name}_id = #{subtype_type}.id" if fk == :many
+              fk = "{#{link.type.table}}.id = {#{subtype_type}:-1}.#{subtype_link_name}_id" if fk == :belongs_to
+              fk = "{#{link.type.table}}.#{parent.name}_id = {#{subtype_type}:-1}.id" if fk == :has_one
+              fk = "{#{link.type.table}}.#{parent.name}_id = {#{subtype_type}:-1}.id" if fk == :many
             else
-              fk = "#{link.type.table}.id = #{parent.table}.#{link.name}_id" if fk == :belongs_to
-              fk = "#{link.type.table}.#{parent.name}_id = #{parent.table}.id" if fk == :has_one
-              fk = "#{link.type.table}.#{parent.name}_id = #{parent.table}.id" if fk == :many
+              fk = "{#{link.type.table}}.id = {#{parent.table}:-1}.#{link.name}_id" if fk == :belongs_to
+              fk = "{#{link.type.table}}.#{parent.name}_id = {#{parent.table}:-1}.id" if fk == :has_one
+              fk = "{#{link.type.table}}.#{parent.name}_id = {#{parent.table}:-1}.id" if fk == :many
             end
 
-            wheres << ("(" + handle_sql_part(fk, params) + ")")
-            wheres << ("(" + handle_sql_part(link.filter, params) + ")") if link.filter
+            wheres << ("(" + handle_sql_part(fk, params, level, table_levels) + ")")
+            wheres << ("(" + handle_sql_part(link.filter, params, level, table_levels) + ")") if link.filter
           end
 
+          table_as = handle_sql_part("{#{type.table}}", params, level, table_levels)
+
           sql = "select to_json("
           sql += "coalesce(json_agg(" if is_many
           sql += "x.*"
           sql += "), '[]'::json)" if is_many
-          sql += ") from (select #{columns} from #{type.table}"
+          sql += ") from (select #{columns} from #{type.table} as #{table_as}"
         
           unless type.subtypes.empty?
             sql += "\n" + type.subtypes.map do |f|
               subtype = f[1]
               fk = subtype.fk.is_a?(Proc) ? subtype.fk.call(level) : subtype.fk
 
-              fk = "#{subtype.name}.id = #{type.table}.id and #{type.table}.type = '#{subtype.name}'" if fk == :subtype
+              fk = "{#{subtype.name}}.id = {#{type.table}}.id and {#{type.table}}.type = '#{subtype.name}'" if fk == :subtype
+              subtype_as = handle_sql_part("{#{subtype.name}}", params, level, table_levels)
 
-              subtype_as = subtype.fk.is_a?(Proc) ? "#{subtype.name}#{level}" : subtype.name
-              # subtype_as = (link && parent && link.type == parent.name) ? "#{subtype.name}#{level}" : subtype.name
-              "left join #{subtype.table} as #{subtype_as} on (#{handle_sql_part(fk, params)})"
+              "left join #{subtype.table} as #{subtype_as} on (#{handle_sql_part(fk, params, level, table_levels)})"
             end.join("\n")
           end
 
 
           sql += " where #{wheres.join(' and ')}" unless wheres.empty?
-          sql += " order by #{order_by}" if order_by
+          sql += " order by #{handle_sql_part(order_by, params, level, table_levels)}" if order_by
           sql += " limit 1" if !is_many
           sql += ") x"
 
         end.join
       else
         root_sql = wrap_root(query.map do |e|          
-          sql = to_sql([e].to_h, 1, params)
+          sql = to_sql([e].to_h, 1, params, table_levels)
           "select '#{e[0]}'::text as key, (#{sql}) as value"
         end.join("\nunion all\n"))
 
@@ -171,12 +204,10 @@ module PgGraphQl
         @subtypes = {}
         @null_pk = false
         @pk = ->(ids, level) do
-          id_column = "#{@table}.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(',') + ")"
             ["#{id_column} in ?", ids]
           else
-            # "#{id_column} = " + (ids.is_a?(String) ? "'#{ids}'" : "#{ids}")
             ["#{id_column} = ?", ids]
           end
         end
@@ -188,7 +219,7 @@ module PgGraphQl
         @fields = fields.map{|f| create_field(f)}
       end
       def fields
-        @fields + [create_field({name: :id, as: nil, expr: ->(c){ "#{@table}.#{c}" }})] + (@subtypes.empty? ? [] : [create_field(:type)])
+        @fields + [create_field({name: :id, as: nil, expr: ->(c){ "#{c}" }})] + (@subtypes.empty? ? [] : [create_field(:type)])
       end
       def create_field(field)
         if field.is_a?(Symbol)

data/test/test_pggraphql.rb

@@ -23,6 +23,88 @@ module PgGraphQl
       res
     end
 
+    def test_simple_level_aware
+      res = to_sql({user: {id: 1, email: "email"}}) do |s|
+        s.root :user
+        s.type :user, fields: [:email]
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select users1.id,
+                  users1.email as email
+                from users as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+
+      assert_equal [1], res[:params]
+    end
+
+    def test_nested_level_aware
+      res = to_sql({user: {id: 1, email: "email", address: {}}}) do |s|
+        s.root :user
+        s.type :user, fields: [:email] do |t|
+          t.has_one :address, order_by: "{users:root}.id desc"
+        end
+        s.type :address
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select users1.id,
+                  users1.email as email,
+                  (select to_json(x.*)
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where (addresses2.user_id = users1.id) order by users1.id desc limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+
+      assert_equal [1], res[:params]
+
+      # ---
+
+
+      res = to_sql({user: {id: 1, email: "email", address: {person: {}}}}) do |s|
+        s.root :user
+        s.type :user, fields: [:email] do |t|
+          t.has_one :address
+        end
+        s.type :address do |t|
+          t.has_one :person
+        end
+
+        s.type :person, order_by: "{users:closest}.id desc"
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select users1.id,
+                  users1.email as email,
+                  (select to_json(x.*)
+                    from (select addresses2.id,
+                        (select to_json(x.*)
+                          from (select people3.id
+                              from people as people3
+                              where (people3.address_id = addresses2.id) order by users1.id desc limit 1) x) as "person"
+                        from addresses as addresses2
+                        where (addresses2.user_id = users1.id) limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+
+      assert_equal [1], res[:params]
+
+    end
+
+
     def test_simple
       res = to_sql({user: {id: 1, email: "email"}}) do |s|
         s.root :user
@@ -32,10 +114,10 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email
-                from users
-                where users.id = ? limit 1) x) as value
+            from (select users1.id,
+                  users1.email as email
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
 
@@ -51,10 +133,10 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email
-                from users
-                where users.id = ? limit 1) x) as value      
+            from (select users1.id,
+                  users1.email as email
+                from users as users1
+                where users1.id = ? limit 1) x) as value      
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
@@ -69,9 +151,9 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select users.id,
-                  email
-                from users) x) as value
+            from (select users1.id,
+                  users1.email as email
+                from users as users1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [], res[:params]
@@ -120,9 +202,9 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email
-                from users where access_token = ? limit 1) x) as value
+            from (select users1.id,
+                  users1.email as email
+                from users as users1 where access_token = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["1"], res[:params]
@@ -137,9 +219,9 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email
-                from users where level1 = ? limit 1) x) as value
+            from (select users1.id,
+                  users1.email as email
+                from users as users1 where level1 = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99"], res[:params]
@@ -154,9 +236,9 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select users.id,
-                  email
-                from users where users.id in ?) x) as value      
+            from (select users1.id,
+                  users1.email as email
+                from users as users1 where users1.id in ?) x) as value      
       SQL
       ), token(res[:sql])
       assert_equal [["1"]], res[:params]
@@ -171,9 +253,9 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email
-                from users where users.id = ? limit 1) x) as value      
+            from (select users1.id,
+                  users1.email as email
+                from users as users1 where users1.id = ? limit 1) x) as value      
       SQL
       ), token(res[:sql])
       assert_equal ["1"], res[:params]
@@ -188,9 +270,9 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select users.id,
-                  email
-                from users where users.id in ?) x) as value      
+            from (select users1.id,
+                  users1.email as email
+                from users as users1 where users1.id in ?) x) as value      
       SQL
       ), token(res[:sql])
       assert_equal [[1]], res[:params]
@@ -205,9 +287,9 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select users.id,
-                  email
-                from users where users.id in ?) x) as value      
+            from (select users1.id,
+                  users1.email as email
+                from users as users1 where users1.id in ?) x) as value      
       SQL
       ), token(res[:sql])
       assert_equal [[1,2]], res[:params]
@@ -222,9 +304,9 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select users.id,
-                  email
-                from users where users.id in ?) x) as value      
+            from (select users1.id,
+                  users1.email as email
+                from users as users1 where users1.id in ?) x) as value      
       SQL
       ), token(res[:sql])
       assert_equal [["1","2"]], res[:params]
@@ -239,10 +321,10 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email
-                from users
-                where users.id = ? and (id > 100) limit 1) x) as value
+            from (select users1.id,
+                  users1.email as email
+                from users as users1
+                where users1.id = ? and (id > 100) limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
@@ -259,15 +341,15 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email
-                from users
-                where users.id = ? limit 1) x) as value
+            from (select users1.id,
+                  users1.email as email
+                from users as users1
+                where users1.id = ? limit 1) x) as value
         union all
         select 'educator'::text as key,
           (select to_json(x.*)
-            from (select educators.id
-                from educators where educators.id = ? limit 1) x) as value
+            from (select educators1.id
+                from educators as educators1 where educators1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1, 99], res[:params]
@@ -285,7 +367,7 @@ module PgGraphQl
       end
 
       assert_equal token(<<-SQL
-        select 'flow'::text as key, (select to_json(x.*) from (select flows.id, data from flows where flows.id = ? limit 1) x) as value
+        select 'flow'::text as key, (select to_json(x.*) from (select flows1.id, flows1.data as data from flows as flows1 where flows1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
@@ -300,7 +382,7 @@ module PgGraphQl
       end
 
       assert_equal token(<<-SQL
-        select 'flow'::text as key, (select to_json(x.*) from (select flows.id, data from flows where flows.id = ? limit 1) x) as value
+        select 'flow'::text as key, (select to_json(x.*) from (select flows1.id, flows1.data from flows as flows1 where flows1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
@@ -315,7 +397,7 @@ module PgGraphQl
       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 = ? limit 1) x) as value
+        select 'flow'::text as key, (select to_json(x.*) from (select flows1.id, to_json(flows1.data) as data from flows as flows1 where flows1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
@@ -330,7 +412,7 @@ module PgGraphQl
       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 = ? limit 1) x) as value
+        select 'flow'::text as key, (select to_json(x.*) from (select flows1.id, to_json(flows1.data) from flows as flows1 where flows1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
@@ -342,55 +424,6 @@ module PgGraphQl
     #####################
 
     def test_inherit
-      res = to_sql({
-        products: {
-          type: nil,
-          clickout__destination_url: nil,
-          download__download_url: nil,
-          download__users: {
-            orders: {}
-          }
-        }
-      }) do |s|
-        s.root :product
-        s.type :user, fields: [:email] do |t|
-          t.many :orders, fk: "user_id = users.id"
-        end
-
-        s.type :order
-        s.type :product, null_pk: :array, fields: [:type, :clickout__destination_url, :download__download_url] do |t|
-          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'"
-          t.many :download__users, type: :user, fk: "id = download.id"
-        end
-      end
-
-      assert_equal token(<<-SQL
-        select 'products'::text as key,
-          (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            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 users.id,
-                          (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                            from (select orders.id
-                                from orders
-                                where (user_id = users.id)) x) as "orders"
-                        from 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')
-                left join product_clickouts as clickout on (clickout.id = products.id
-                    and products.type = 'clickout')) x) as value
-      SQL
-      ), token(res[:sql])
-      assert_equal [], res[:params]
-
-      # ------
-
       res = to_sql({
         products: {
           type: nil,
@@ -408,32 +441,33 @@ module PgGraphQl
 
         s.type :order
         s.type :product, null_pk: :array, fields: [:type, :clickout__destination_url, :download__download_url] do |t|
-          t.subtype :download, table: :product_downloads
           t.subtype :clickout, table: :product_clickouts
-          t.many :download__users, type: :user
+          t.subtype :download, table: :product_downloads do |st|
+            st.many :users, type: :user
+          end
         end
       end
 
       assert_equal token(<<-SQL
         select 'products'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select products.id,
-                  type,
-                  clickout.destination_url as clickout__destination_url,
-                  download.download_url as download__download_url,
+            from (select products1.id,
+                  products1.type as type,
+                  clickout1.destination_url as clickout__destination_url,
+                  download1.download_url as download__download_url,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select users.id,
+                    from (select users2.id,
                           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                            from (select orders.id
-                                from orders
-                                where (orders.user_id = users.id)) x) as "orders"
-                        from users
-                        where (users.product_id = download.id)) x) as "download__users"
-                from products
-                left join product_downloads as download on (download.id = products.id
-                    and products.type = 'download')
-                left join product_clickouts as clickout on (clickout.id = products.id
-                    and products.type = 'clickout')) x) as value
+                            from (select orders3.id
+                                from orders as orders3
+                                where (orders3.user_id = users2.id)) x) as "orders"
+                        from users as users2
+                        where (users2.product_id = download1.id)) x) as "download__users"
+                from products as products1
+                left join product_clickouts as clickout1 on (clickout1.id = products1.id
+                    and products1.type = 'clickout')
+                left join product_downloads as download1 on (download1.id = products1.id
+                    and products1.type = 'download')) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [], res[:params]    
@@ -467,23 +501,23 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'products'::text as key,
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-            from (select products.id,
-                  type,
-                  clickout.destination_url as clickout__destination_url,
-                  download.download_url as download__download_url,
+            from (select products1.id,
+                  products1.type as type,
+                  clickout1.destination_url as clickout__destination_url,
+                  download1.download_url as download__download_url,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select users.id,
+                    from (select users2.id,
                           (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                            from (select orders.id
-                                from orders
-                                where (orders.user_id = users.id)) x) as "orders"
-                        from users
-                        where (users.product_id = download.id)) x) as "download__users"
-                from products
-                left join product_downloads as download on (download.id = products.id
-                    and products.type = 'download')
-                left join product_clickouts as clickout on (clickout.id = products.id
-                    and products.type = 'clickout')) x) as value
+                            from (select orders3.id
+                                from orders as orders3
+                                where (orders3.user_id = users2.id)) x) as "orders"
+                        from users as users2
+                        where (users2.product_id = download1.id)) x) as "download__users"
+                from products as products1
+                left join product_downloads as download1 on (download1.id = products1.id
+                    and products1.type = 'download')
+                left join product_clickouts as clickout1 on (clickout1.id = products1.id
+                    and products1.type = 'clickout')) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [], res[:params]          
@@ -498,18 +532,19 @@ module PgGraphQl
       }) do |s|
         s.root :product
         s.type :product, null_pk: :array, fields: [:clickout__destination_url, :download__download_url] do |t|
-          t.subtype :clickout, table: :product_clickouts, fk: "clickout.id = products.id and products.type = 'clickout'"
+          t.subtype :clickout, table: :product_clickouts
         end
       end
 
       assert_equal token(<<-SQL
         select 'products'::text as key,
           (select to_json(x.*)
-            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
-                    and products.type = 'clickout') where products.id = ? limit 1) x) as value
+            from (select products1.id, 
+                  products1.type as type,
+                  clickout1.destination_url as clickout__destination_url
+                from products as products1
+                left join product_clickouts as clickout1 on (clickout1.id = products1.id
+                    and products1.type = 'clickout') where products1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
@@ -524,7 +559,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.one :address, fk: :belongs_to
+          t.belongs_to :address
         end
         s.type :address
       end
@@ -532,14 +567,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(x.*)
-                    from (select addresses.id
-                        from addresses
-                        where addresses.id = ? and (addresses.id = users.address_id) limit 1) x) as "address"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.id = users1.address_id) limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
@@ -549,7 +584,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", other_address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.one :other_address, type: :address, fk: :belongs_to
+          t.belongs_to :other_address, type: :address
         end
         s.type :address
       end
@@ -557,14 +592,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(x.*)
-                    from (select addresses.id
-                        from addresses
-                        where addresses.id = ? and (addresses.id = users.other_address_id) limit 1) x) as "other_address"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.id = users1.other_address_id) limit 1) x) as "other_address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
@@ -574,32 +609,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", other_address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.one :other_address, type: :address, fk: :has_one
-        end
-        s.type :address
-      end
-
-      assert_equal token(<<-SQL
-        select 'user'::text as key,
-          (select to_json(x.*)
-            from (select users.id,
-                  email,
-                  (select to_json(x.*)
-                    from (select addresses.id
-                        from addresses
-                        where addresses.id = ? and (addresses.user_id = users.id) limit 1) x) as "other_address"
-                from users
-                where users.id = ? limit 1) x) as value
-      SQL
-      ), token(res[:sql])
-      assert_equal ["99", 1], res[:params]
-    end
-
-    def test_link_has_one
-      res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
-        s.root :user
-        s.type :user, fields: [:email] do |t|
-          t.one :address, fk: :has_one
+          t.has_one :other_address, type: :address
         end
         s.type :address
       end
@@ -607,14 +617,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(x.*)
-                    from (select addresses.id
-                        from addresses
-                        where addresses.id = ? and (addresses.user_id = users.id) limit 1) x) as "address"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.user_id = users1.id) limit 1) x) as "other_address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
@@ -624,7 +634,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.one :address, fk: "id = users.address_id"
+          t.belongs_to :address
         end
         s.type :address
       end
@@ -632,14 +642,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(x.*)
-                    from (select addresses.id
-                        from addresses
-                        where addresses.id = ? and (id = users.address_id) limit 1) x) as "address"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.id = users1.address_id) limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
@@ -649,7 +659,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {id: 99}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.one :address, fk: "id = users.address_id"
+          t.belongs_to :address
         end
         s.type :address
       end
@@ -657,14 +667,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(x.*)
-                    from (select addresses.id
-                        from addresses
-                        where addresses.id = ? and (id = users.address_id) limit 1) x) as "address"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.id = users1.address_id) limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [99, 1], res[:params]
@@ -672,7 +682,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {id: [99,999]}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.one :address, fk: "id = users.address_id"
+          t.belongs_to :address
         end
         s.type :address
       end
@@ -680,14 +690,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(x.*)
-                    from (select addresses.id
-                        from addresses
-                        where addresses.id in ? and (id = users.address_id) limit 1) x) as "address"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id in ? and (addresses2.id = users1.address_id) limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [[99,999], 1], res[:params]
@@ -697,7 +707,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.one :address, fk: "id = users.address_id"
+          t.belongs_to :address
         end
         s.type :address
       end
@@ -705,14 +715,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(x.*)
-                    from (select addresses.id
-                        from addresses
-                        where (id = users.address_id) limit 1) x) as "address"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where (addresses2.id = users1.address_id) limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
@@ -743,14 +753,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(x.*)
-                    from (select addresses.id
-                        from addresses
-                        where addresses.id = ? and (id = (select 100)) limit 1) x) as "address"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (id = (select 100)) limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
@@ -760,7 +770,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.one :address, fk: "user_id = users.id", filter: "id > 100"
+          t.has_one :address, filter: "id > 100"
         end
         s.type :address
       end
@@ -768,14 +778,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (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"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.user_id = users1.id) and (id > 100) limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
@@ -785,7 +795,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.one :address, fk: "user_id = users.id", order_by: "id desc"
+          t.has_one :address, order_by: "id desc"
         end
         s.type :address
       end
@@ -793,31 +803,31 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (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"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.user_id = users1.id) order by id desc limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
     end
 
-    #####################
-    # one-in-one
-    #####################
+    # #####################
+    # # one-in-one
+    # #####################
 
     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: [:email] do |t|
-          t.one :address, fk: "user_id = users.id"
+          t.has_one :address
         end
         s.type :address do |t|
-          t.one :country, fk: "id = addresses.country_id"
+          t.belongs_to :country
         end
         s.type :country
       end
@@ -825,33 +835,33 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(x.*)
-                    from (select addresses.id,
+                    from (select addresses2.id,
                           (select to_json(x.*)
-                            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 users.id = ? limit 1) x) as value
+                            from (select countries3.id
+                                from countries as countries3
+                                where (countries3.id = addresses2.country_id) limit 1) x) as "country"
+                        from addresses as addresses2
+                        where (addresses2.user_id = users1.id) limit 1) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
     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: [:email] do |t|
-          t.many :address, fk: "user_id = users.id"
+          t.many :address
         end
         s.type :address
       end
@@ -859,14 +869,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (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"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.user_id = users1.id)) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
@@ -876,7 +886,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.many :address, fk: :many
+          t.many :address
         end
         s.type :address
       end
@@ -884,14 +894,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select addresses.id
-                        from addresses
-                        where addresses.id = ? and (addresses.user_id = users.id)) x) as "address"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.user_id = users1.id)) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
@@ -901,7 +911,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", other_addresses: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.many :other_addresses, type: :address, fk: :many
+          t.many :other_addresses, type: :address
         end
         s.type :address
       end
@@ -909,14 +919,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select addresses.id
-                        from addresses
-                        where addresses.id = ? and (addresses.user_id = users.id)) x) as "other_addresses"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.user_id = users1.id)) x) as "other_addresses"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
@@ -926,7 +936,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {id: ["99","999"]}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.many :address, fk: "user_id = users.id"
+          t.many :address
         end
         s.type :address
       end
@@ -934,14 +944,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (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"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id in ? and (addresses2.user_id = users1.id)) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [["99","999"], 1], res[:params]
@@ -951,7 +961,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.many :address, fk: "user_id = users.id"
+          t.many :address
         end
         s.type :address
       end
@@ -959,14 +969,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
-                    from (select addresses.id
-                        from addresses
-                        where (user_id = users.id)) x) as "address"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where (addresses2.user_id = users1.id)) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
@@ -976,7 +986,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.many :address, fk: "user_id = users.id", filter: "id % 2 = 0"
+          t.many :address, filter: "id % 2 = 0"
         end
         s.type :address
       end
@@ -984,14 +994,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (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"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.user_id = users1.id) and (id % 2 = 0)) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
@@ -1001,7 +1011,7 @@ module PgGraphQl
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.many :address, fk: "user_id = users.id", order_by: "id desc"
+          t.many :address, order_by: "id desc"
         end
         s.type :address
       end
@@ -1009,14 +1019,14 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
-            from (select users.id,
-                  email,
+            from (select users1.id,
+                  users1.email as email,
                   (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"
-                from users
-                where users.id = ? limit 1) x) as value
+                    from (select addresses2.id
+                        from addresses as addresses2
+                        where addresses2.id = ? and (addresses2.user_id = users1.id) order by id desc) x) as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pggraphql
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors:
 - Jan Zimmek