pggraphql 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65e7eaaf4c7e9673a17103bc2b07a3055d31880b
-  data.tar.gz: b57b7de320273a0a05ad873c7aba85182414aabf
+  metadata.gz: 99fb888e996dd5a6d047dfe87d4b486aa5bdc1ba
+  data.tar.gz: c213c7424178a7f0471e7992d47cdb81712b343a
 SHA512:
-  metadata.gz: 446888a65b6a5476b435285f3f7a64171ac32542e9188eec0e75abf252654d09f30e35c6aeca10c4dce5f3ed9ee2c47327bda12220491618734020318992f89b
-  data.tar.gz: 50e1392dde0d8e6a5f2fb2de57615dad7b884ccbaee093e5abde11ea77ee5278e8db931e13e9504d0c9ae1d318d64a6617fdd164b57e683d0c47c0cafae6302f
+  metadata.gz: cd11586d6134db20251c457d277f99e5c2e5d3efe7fa472798d5a41dd2680c0fe11c18e288074622956e5035b004139340c65e3ece5a9bc032fcd55e6a74dbc6
+  data.tar.gz: 69bc3ba9ca3f7e081c743ae483208fd109e8da9dafe218e109847e1726207fdbe604314d31bc80ec11bbd617f4273b3d611e9c57dd3eace0907ef93c5cb4ee0d

data/lib/pggraphql.rb

@@ -24,9 +24,17 @@ module PgGraphQl
       yield(type) if block_given?
     end
 
-    def handle_sql_part(part, params, level, table_levels)
+    def handle_sql_part(part, params, level, table_levels, guard=nil)
       next_part = if part.is_a?(Array)
-        part.slice(1..-1).each{|param| params << param}
+        part.slice(1..-1).each do |param|
+          params << param
+        end
+
+        cnt1 = part[0].scan(/\?/).count
+        cnt2 = part.length - 1
+
+        raise "placeholder mismatch #{cnt1} != #{cnt2} in #{part}" if cnt1 != cnt2
+
         part[0]
       elsif part.is_a?(String)
         part
@@ -71,7 +79,7 @@ module PgGraphQl
           type = link ? link.type : self.types[e[0].to_s.split("@").first.singularize.to_sym]
           ids = e[1][:id]
 
-          unless type            
+          unless type
             ap({
               "known types": self.types.keys,
               "link name": link_name,
@@ -106,7 +114,22 @@ 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, table_levels, type, nested_link_name) + ") as \"#{field_name}\""
+              inner_sql_proc = ->{ "(" + to_sql([f].to_h, level + 1, params, table_levels, type, nested_link_name) + ")" }
+              inner_link = type.links[nested_link_name.to_s.split("@").first.to_sym]
+
+              inner_sql = if inner_link.guard
+                guarded_value = inner_link.many? ? "to_json('[]'::json)" : "null"
+                guard = handle_sql_part(inner_link.guard, params, level, table_levels)
+
+                "case
+                    when #{guard} then #{inner_sql_proc.call}
+                    else #{guarded_value}
+                  end"
+              else
+                inner_sql_proc.call
+              end
+
+              inner_sql + " as \"#{field_name}\""
             else
               field_def = type.fields.detect{|f| f[:name] == field_name}
 
@@ -115,15 +138,27 @@ module PgGraphQl
               else
                 field_def[:name]
               end
-              
+
               unless column_name.to_s.index(".")
                 column_name = :"{#{type.table}}.#{column_name}"
               end
 
-              column_expr = if field_def[:expr]
-                handle_sql_part(field_def[:expr].call(column_name), params, level, table_levels)
+              column_expr_proc = -> do
+                if field_def[:expr]
+                  handle_sql_part(field_def[:expr].call(column_name), params, level, table_levels)
+                else
+                  handle_sql_part("#{column_name}", params, level, table_levels)
+                end
+              end
+
+              column_expr = if field_def[:guard]
+                guard = handle_sql_part(field_def[:guard], params, level, table_levels)
+                column_expr = "case
+                    when #{guard} then #{column_expr_proc.call}
+                    else null
+                  end"
               else
-                handle_sql_part("#{column_name}", params, level, table_levels)
+                column_expr_proc.call
               end
 
               "#{column_expr}" + (field_def[:as] ? " as #{field_def[:as]}" : "")
@@ -170,7 +205,7 @@ module PgGraphQl
           sql += "x.*"
           sql += "), '[]'::json)" if is_many
           sql += ") from (select #{columns} from #{type.table} as #{table_as}"
-        
+
           unless type.subtypes.empty?
             sql += "\n" + type.subtypes.map do |f|
               subtype = f[1]
@@ -191,7 +226,7 @@ module PgGraphQl
 
         end.join
       else
-        root_sql = wrap_root(query.map do |e|          
+        root_sql = wrap_root(query.map do |e|
           sql = to_sql([e].to_h, 1, params, table_levels)
           "select '#{e[0]}'::text as key, (#{sql}) as value"
         end.join("\nunion all\n"))
@@ -244,7 +279,7 @@ module PgGraphQl
           field
         else
           raise "unsupported field #{field.inspect}"
-        end         
+        end
       end
 
       def one(name, opts={})
@@ -264,7 +299,7 @@ module PgGraphQl
       end
       def subtype(name, opts={})
         subtype = @subtypes[name] = SubType.new(self, name)
-        {fk: :subtype}.merge(opts).each_pair do |key, val| 
+        {fk: :subtype}.merge(opts).each_pair do |key, val|
           subtype.send(:"#{key}=", val)
         end
         yield(subtype) if block_given?
@@ -272,7 +307,7 @@ module PgGraphQl
       end
       def create_link(name, many, opts)
         link = @links[name] = Link.new(self, name, many)
-        opts.each_pair do |key, val| 
+        opts.each_pair do |key, val|
           link.send(:"#{key}=", val)
         end
         link
@@ -303,7 +338,7 @@ module PgGraphQl
     end
 
     class Link
-      attr_accessor :name, :filter, :fk, :order_by
+      attr_accessor :name, :filter, :fk, :order_by, :guard
       def initialize(owner, name, many)
         @owner = owner
         @name = name

data/lib/pggraphql/version.rb

@@ -1,3 +1,3 @@
 module Pggraphql
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/test_pggraphql.rb

@@ -14,7 +14,7 @@ module PgGraphQl
       s.class.send(:define_method, :wrap_root) do |unwrapped_sql|
         unwrapped_sql
       end
-      
+
       res = s.to_sql(query)
 
       sql, params = res.values_at(:sql, :params)
@@ -136,7 +136,7 @@ module PgGraphQl
             from (select users1.id,
                   users1.email as email
                 from users as users1
-                where users1.id = ? limit 1) x) as value      
+                where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
@@ -160,6 +160,110 @@ module PgGraphQl
 
     end
 
+    def test_guard_field
+      res = to_sql({user: {id: 1, email: nil}}) do |s|
+        s.root :user
+        s.type :user, fields: [{name: :email, guard: "true"}]
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select users1.id,
+                  case
+                    when true then users1.email
+                    else null
+                  end as email
+                from users as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+    end
+
+    def test_guard_link_belongs_to
+      res = to_sql({user: {id: 1, email: nil, address: {id: "99"}}}) do |s|
+        s.root :user
+        s.type :user, fields: [:email] do |t|
+          t.belongs_to :address, guard: "true"
+        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,
+                  case
+                    when true then (select to_json(x.*)
+                      from (select addresses2.id
+                          from addresses as addresses2
+                          where addresses2.id = ? and (addresses2.id = users1.address_id) limit 1) x)
+                    else null
+                  end 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
+
+    def test_guard_link_many
+      res = to_sql({user: {id: 1, email: nil, address: {id: "99"}}}) do |s|
+        s.root :user
+        s.type :user, fields: [:email] do |t|
+          t.many :address, guard: "true"
+        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,
+                  case
+                    when true then (select to_json(coalesce(json_agg(x.*), '[]'::json))
+                      from (select addresses2.id
+                          from addresses as addresses2
+                          where addresses2.id = ? and (addresses2.user_id = users1.id)) x)
+                    else to_json('[]'::json)
+                  end as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+    end
+
+    def test_guard_link_many_with_fk
+      res = to_sql({user: {id: 1, email: nil, address: {id: 99}}}) do |s|
+        s.root :user
+        s.type :user, fields: [:email] do |t|
+          t.many :address, guard: ["2 = ?", 2]
+        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,
+                  case
+                    when 2 = ? then (select to_json(coalesce(json_agg(x.*), '[]'::json))
+                      from (select addresses2.id
+                          from addresses as addresses2
+                          where addresses2.id = ? and (addresses2.user_id = users1.id)) x)
+                    else to_json('[]'::json)
+                  end as "address"
+                from users as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+
+      assert_equal [2, 99, 1], res[:params]
+    end
+
     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|
@@ -238,7 +342,7 @@ module PgGraphQl
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
             from (select users1.id,
                   users1.email as email
-                from users as users1 where users1.id in ?) x) as value      
+                from users as users1 where users1.id in ?) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [["1"]], res[:params]
@@ -255,7 +359,7 @@ module PgGraphQl
           (select to_json(x.*)
             from (select users1.id,
                   users1.email as email
-                from users as users1 where users1.id = ? limit 1) x) as value      
+                from users as users1 where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
       assert_equal ["1"], res[:params]
@@ -272,7 +376,7 @@ module PgGraphQl
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
             from (select users1.id,
                   users1.email as email
-                from users as users1 where users1.id in ?) x) as value      
+                from users as users1 where users1.id in ?) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [[1]], res[:params]
@@ -289,7 +393,7 @@ module PgGraphQl
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
             from (select users1.id,
                   users1.email as email
-                from users as users1 where users1.id in ?) x) as value      
+                from users as users1 where users1.id in ?) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [[1,2]], res[:params]
@@ -306,7 +410,7 @@ module PgGraphQl
           (select to_json(coalesce(json_agg(x.*), '[]'::json))
             from (select users1.id,
                   users1.email as email
-                from users as users1 where users1.id in ?) x) as value      
+                from users as users1 where users1.id in ?) x) as value
       SQL
       ), token(res[:sql])
       assert_equal [["1","2"]], res[:params]
@@ -470,7 +574,7 @@ module PgGraphQl
                     and products1.type = 'download')) x) as value
       SQL
       ), token(res[:sql])
-      assert_equal [], res[:params]    
+      assert_equal [], res[:params]
 
       # ------
 
@@ -520,7 +624,7 @@ module PgGraphQl
                     and products1.type = 'clickout')) x) as value
       SQL
       ), token(res[:sql])
-      assert_equal [], res[:params]          
+      assert_equal [], res[:params]
     end
 
     def test_inherit_with_pk
@@ -539,7 +643,7 @@ module PgGraphQl
       assert_equal token(<<-SQL
         select 'products'::text as key,
           (select to_json(x.*)
-            from (select products1.id, 
+            from (select products1.id,
                   products1.type as type,
                   clickout1.destination_url as clickout__destination_url
                 from products as products1
@@ -548,7 +652,7 @@ module PgGraphQl
       SQL
       ), token(res[:sql])
       assert_equal [1], res[:params]
-      
+
     end
 
     #####################
@@ -737,7 +841,7 @@ module PgGraphQl
           end
           s.type :address
         end
-      end      
+      end
     end
 
 
@@ -1032,5 +1136,26 @@ module PgGraphQl
       assert_equal ["99", 1], res[:params]
     end
 
+    def test_handle_sql_part
+      s = PgGraphQl::Schema.new
+
+      params = []
+      level = 1
+      table_levels={}
+
+      assert_equal "users1.id = 1", s.handle_sql_part("{users}.id = 1", params, level, table_levels)
+      assert_equal "users2.id = 2", s.handle_sql_part("{users}.id = 2", params, level + 1, table_levels)
+      assert_equal "users1.id = 3", s.handle_sql_part("{users}.id = 3", params, level, table_levels)
+
+      assert_equal "users1.id = ?", s.handle_sql_part(["{users}.id = ?", 101], params, level, table_levels)
+      assert_equal "users2.id = ?", s.handle_sql_part(["{users}.id = ?", 102], params, level + 1, table_levels)
+      assert_equal "users1.id = ?", s.handle_sql_part(["{users}.id = ?", 103], params, level, table_levels)
+
+      assert_equal "users1.id = ?", s.handle_sql_part(["{users}.id = ?", 101], params, level, table_levels)
+      assert_equal "educators2.id = ?", s.handle_sql_part(["{educators}.id = ?", 102], params, level + 1, table_levels)
+      assert_equal "users1.id = ?", s.handle_sql_part(["{users}.id = ?", 103], params, level, table_levels)
+      assert_equal "educators1.id = ?", s.handle_sql_part(["{educators}.id = ?", 104], params, level, table_levels)
+    end
+
   end
 end

metadata

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