pggraphql 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 740c71df80baf59979c79d246a8956a8381bada1
-  data.tar.gz: 86c5e60636bc5f3d28c210f096ed7684f2a62905
+  metadata.gz: b04ff239be18d90b85971b13eb3f7722a28de47a
+  data.tar.gz: 360719c079f33dd65b4ddaebd4fd87bc95782b50
 SHA512:
-  metadata.gz: 40b4f96fc5588dacf2ee4d5810f654f54bfc16c36139bba646dfad743488429712b07c48cdcc7cd3d60e31be29d6a64222734b9cf8078c928b20c1aad8b4fb15
-  data.tar.gz: 8e073df1c7d2f6d7050520b843e1999256a13e58eed043d17b97398d132959e7ba7047673c727380bb115715d06484f6519049d4fabc7ad1800c5ec2b18dd8ec
+  metadata.gz: 90fd83702b235304dd8c60981f7a0521e20cecb1e26b3df3b07a5b6d8ef86d56038f201f1d8b9f884975ad24e4d294f85f1c40e3286a7eaf4a675a3d5e3c247b
+  data.tar.gz: 32d51411460608e6a375d3e198201b43b0c211afbba68bb9c1a7b58edfb63d8ad8824138fd449804cd2755197123b4e69e2eb76031ad3bf6ddc5f15f095feab1

data/lib/pggraphql/version.rb

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

data/lib/pggraphql.rb

@@ -1,4 +1,5 @@
 require "active_support/all"
+require "sequel"
 require "pggraphql/version"
 
 module PgGraphQl
@@ -23,7 +24,18 @@ module PgGraphQl
       yield(type) if block_given?
     end
 
-    def to_sql(query, level=0, parent=nil, link_name=nil)
+    def handle_sql_part(part, params)
+      if part.is_a?(Array)
+        part.slice(1..-1).each{|param| params << param}
+        part[0]
+      elsif part.is_a?(String)
+        part
+      else
+        raise "unsupported sql part: #{part}"
+      end
+    end
+
+    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
@@ -49,7 +61,7 @@ module PgGraphQl
             raise "unknown link #{field_name.inspect} on type #{type.name.inspect}" if f[1].is_a?(Hash) && !type.links.include?(field_name)
 
             if f[1].is_a?(Hash)
-              "(" + to_sql([f].to_h, level + 1, 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}
 
@@ -78,13 +90,15 @@ module PgGraphQl
 
           raise "missing :id for root type #{type.name.inspect}" if !ids && level == 1 && !type.null_pk
 
-          wheres << type.pk.call(ids, level) if ids && type.pk.call(ids, level)
+          if ids && type.pk.call(ids, level)
+            wheres << handle_sql_part(type.pk.call(ids, level), params)
+          end
 
-          wheres << ("(" + type.filter + ")") if type.filter
+          wheres << ("(" + handle_sql_part(type.filter, params) + ")") if type.filter
 
           if link
-            wheres << ("(" + link.fk + ")")
-            wheres << ("(" + link.filter + ")") if link.filter
+            wheres << ("(" + handle_sql_part(link.fk, params) + ")")
+            wheres << ("(" + handle_sql_part(link.filter, params) + ")") if link.filter
           end
 
           sql = "select to_json("
@@ -97,7 +111,7 @@ module PgGraphQl
           unless type.subtypes.empty?
             sql += "\n" + type.subtypes.map do |f|
               subtype = f[1]
-              "left join #{subtype.table} as #{subtype.name} on (#{subtype.fk})"
+              "left join #{subtype.table} as #{subtype.name} on (#{handle_sql_part(subtype.fk, params)})"
             end.join("\n")
           end
 
@@ -109,10 +123,12 @@ module PgGraphQl
 
         end.join
       else
-        wrap_root(query.map do |e|          
-          sql = to_sql([e].to_h, 1)
+        root_sql = wrap_root(query.map do |e|          
+          sql = to_sql([e].to_h, 1, params)
           "select '#{e[0]}'::text as key, (#{sql}) as value"
         end.join("\nunion all\n"))
+
+        {sql: root_sql, params: params}
       end
     end
 
@@ -136,9 +152,11 @@ module PgGraphQl
         @pk = ->(ids, level) do
           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.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.is_a?(String) ? "'#{ids}'" : "#{ids}")
+            ["#{id_column} = ?", ids]
           end
         end
       end

data/test/test_pggraphql.rb

@@ -15,9 +15,12 @@ module PgGraphQl
         unwrapped_sql
       end
       
-      sql = s.to_sql(query)
+      res = s.to_sql(query)
+
+      sql, params = res.values_at(:sql, :params)
       puts sql if print_sql
-      sql
+
+      res
     end
 
     def test_simple
@@ -32,9 +35,11 @@ module PgGraphQl
             from (select users.id,
                   email
                 from users
-                where users.id = 1 limit 1) x) as value      
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+
+      assert_equal [1], res[:params]
 
       # ---
 
@@ -49,9 +54,10 @@ module PgGraphQl
             from (select users.id,
                   email
                 from users
-                where users.id = 1 limit 1) x) as value      
+                where users.id = ? limit 1) x) as value      
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
 
       # ---
 
@@ -65,9 +71,11 @@ module PgGraphQl
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
             from (select users.id,
                   email
-                from users) x) as value      
+                from users) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [], res[:params]
+
     end
 
     def test_simple_fail_when_accessing_non_root
@@ -106,7 +114,7 @@ module PgGraphQl
     def test_simple_pk_custom
       res = to_sql({user: {id: "1", email: "email"}}) do |s|
         s.root :user
-        s.type :user, fields: [:email], pk: ->(id, level){ "access_token = '#{id}'" }
+        s.type :user, fields: [:email], pk: ->(id, level){ ["access_token = ?", id] }
       end
 
       assert_equal token(<<-SQL
@@ -114,15 +122,16 @@ module PgGraphQl
           (select to_json(x.*)
             from (select users.id,
                   email
-                from users where access_token = '1' limit 1) x) as value
+                from users where access_token = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal ["1"], res[:params]
     end
 
     def test_simple_pk_with_level
       res = to_sql({user: {id: "99", email: "email"}}) do |s|
         s.root :user
-        s.type :user, fields: [:email], pk: ->(id, level){ "level#{level} = '#{id}'" }
+        s.type :user, fields: [:email], pk: ->(id, level){ ["level#{level} = ?", id] }
       end
 
       assert_equal token(<<-SQL
@@ -130,9 +139,10 @@ module PgGraphQl
           (select to_json(x.*)
             from (select users.id,
                   email
-                from users where level1 = '99' limit 1) x) as value
+                from users where level1 = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal ["99"], res[:params]
     end
 
     def test_simple_pk_type_handling
@@ -146,9 +156,10 @@ module PgGraphQl
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
             from (select users.id,
                   email
-                from users where users.id in ('1')) x) as value      
+                from users where users.id in ?) x) as value      
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [["1"]], res[:params]
 
       # ---
 
@@ -162,9 +173,10 @@ module PgGraphQl
           (select to_json(x.*)
             from (select users.id,
                   email
-                from users where users.id = '1' limit 1) x) as value      
+                from users where users.id = ? limit 1) x) as value      
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal ["1"], res[:params]
     end
 
     def test_simple_pk_array_one
@@ -178,9 +190,10 @@ module PgGraphQl
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
             from (select users.id,
                   email
-                from users where users.id in (1)) x) as value      
+                from users where users.id in ?) x) as value      
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [[1]], res[:params]
     end
 
     def test_simple_pk_array_multiple
@@ -194,9 +207,10 @@ module PgGraphQl
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
             from (select users.id,
                   email
-                from users where users.id in (1,2)) x) as value      
+                from users where users.id in ?) x) as value      
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [[1,2]], res[:params]
 
       # ---
 
@@ -210,9 +224,10 @@ module PgGraphQl
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
             from (select users.id,
                   email
-                from users where users.id in ('1','2')) x) as value      
+                from users where users.id in ?) x) as value      
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [["1","2"]], res[:params]
     end
 
     def test_simple_filter
@@ -227,9 +242,10 @@ module PgGraphQl
             from (select users.id,
                   email
                 from users
-                where users.id = 1 and (id > 100) limit 1) x) as value      
+                where users.id = ? and (id > 100) limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
     end
 
     def test_simple_multiple
@@ -246,14 +262,15 @@ module PgGraphQl
             from (select users.id,
                   email
                 from users
-                where users.id = 1 limit 1) x) as value
+                where users.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 = 99 limit 1) x) as value
+                from educators where educators.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1, 99], res[:params]
     end
 
     def test_simple_strange_nested_to_json_for_json_datatype_with_column_alias
@@ -268,9 +285,10 @@ 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 = 1 limit 1) x) as value
+        select 'flow'::text as key, (select to_json(x.*) from (select flows.id, data from flows where flows.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
 
       # ------
 
@@ -282,9 +300,10 @@ 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 = 1 limit 1) x) as value
+        select 'flow'::text as key, (select to_json(x.*) from (select flows.id, data from flows where flows.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
 
       # ------
 
@@ -296,9 +315,10 @@ 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 = 1 limit 1) x) as value
+        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
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
 
       # ------ positive check
 
@@ -310,9 +330,10 @@ 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 = 1 limit 1) x) as value
+        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
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
 
     end
 
@@ -370,7 +391,8 @@ 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[:sql])
+      assert_equal [], res[:params]
     end
 
     def test_inherit_with_pk
@@ -393,9 +415,10 @@ module PgGraphQl
                   clickout.destination_url as clickout__destination_url
                 from products
                 left join product_clickouts as clickout on (clickout.id = products.id
-                    and products.type = 'clickout') where products.id = 1 limit 1) x) as value
+                    and products.type = 'clickout') where products.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
       
     end
 
@@ -421,11 +444,12 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id = '99' 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 = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal ["99", 1], res[:params]
     end
 
     def test_link_one_nested_pk
@@ -445,11 +469,12 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id = 99 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 = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [99, 1], res[:params]
 
       res = to_sql({user: {id: 1, email: "email", address: {id: [99,999]}}}) do |s|
         s.root :user
@@ -467,11 +492,12 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id in (99,999) 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 = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)    
+      ), token(res[:sql])
+      assert_equal [[99,999], 1], res[:params]
     end
 
     def test_link_one_empty_fields
@@ -493,9 +519,10 @@ module PgGraphQl
                         from addresses
                         where (id = users.address_id) limit 1) x) as address
                 from users
-                where users.id = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
     end
 
     def test_link_one_missing_fk
@@ -528,11 +555,12 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id = '99' 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 = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal ["99", 1], res[:params]
     end
 
     def test_link_one_filter
@@ -552,11 +580,12 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id = '99' 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 = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal ["99", 1], res[:params]
     end
 
     def test_link_one_order_by
@@ -576,11 +605,12 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select addresses.id
                         from addresses
-                        where addresses.id = '99' 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 = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal ["99", 1], res[:params]
     end
 
     #####################
@@ -613,14 +643,15 @@ module PgGraphQl
                         from addresses
                         where (user_id = users.id) limit 1) x) as address
                 from users
-                where users.id = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
     end
 
-    # #####################
-    # # many
-    # #####################
+    #####################
+    # many
+    #####################
 
 
     def test_link_many
@@ -640,11 +671,12 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select addresses.id
                         from addresses
-                        where addresses.id = '99' and (user_id = users.id)) x) as address
+                        where addresses.id = ? and (user_id = users.id)) x) as address
                 from users
-                where users.id = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal ["99", 1], res[:params]
     end
 
     def test_link_many_nested_pk
@@ -664,11 +696,12 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select addresses.id
                         from addresses
-                        where addresses.id in ('99','999') 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 = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [["99","999"], 1], res[:params]
     end
 
     def test_link_many_empty_fields
@@ -690,9 +723,10 @@ module PgGraphQl
                         from addresses
                         where (user_id = users.id)) x) as address
                 from users
-                where users.id = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
     end
 
     def test_link_many_filter
@@ -712,11 +746,12 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select addresses.id
                         from addresses
-                        where addresses.id = '99' 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 = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal ["99", 1], res[:params]
     end
 
     def test_link_many_order_by
@@ -736,11 +771,12 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select addresses.id
                         from addresses
-                        where addresses.id = '99' 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 = 1 limit 1) x) as value
+                where users.id = ? limit 1) x) as value
       SQL
-      ), token(res)
+      ), token(res[:sql])
+      assert_equal ["99", 1], res[:params]
     end
 
   end

metadata

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