pggraphql 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce3ae8e16af5b6972f61cacef41f24d9b19f8672
-  data.tar.gz: bec017114b149de19a7cdca9a4f5e9d0663e7086
+  metadata.gz: 50e64d160c0600af362f81584ad44a4a7f78d591
+  data.tar.gz: 632dcd3c7395989a483f937fb9da7f01858a7a2f
 SHA512:
-  metadata.gz: 0aa31bbf4d066e4d2265f410e00436dcf773488c5723cacf339b8c13221e948736398d96647c869e0605e03091de3047537d4b30a8bb394de2a0de8559f56cc0
-  data.tar.gz: 448db0dd34a71332eec63993039d423ea752df5b2f05521f35b9065c82644da8f4d852939f84e3450f2febf2ff32584b0b4db127b084096e62c877b2992b2049
+  metadata.gz: 6564555082bb0560edad1f28a701ea0aca4ef097adfb2a03105071cfc43321361d9855b3a81ac182edf58a11409da8bf8edbb9ec20f4402a3df489de06f1fa02
+  data.tar.gz: 5cf566b528dfd0262cf42dea969d2bd655f134fc48b4429af2fef054035aae70cc2e72ce487b0e57ce20e6f3a7d21d6a8d5bf06885bd720ad2314e7d754dc373

data/lib/pggraphql/version.rb

@@ -1,3 +1,3 @@
 module Pggraphql
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/pggraphql.rb

@@ -30,7 +30,7 @@ module PgGraphQl
           type = link ? link.type : self.types[e[0].to_s.singularize.to_sym]
           ids = e[1][:id]
 
-          # puts "#{e[0].inspect}, #{link_name.inspect} ... type: #{type.inspect}"
+          raise "#{type.name.inspect} is not a root type" if level == 1 && !@roots.include?(type)
 
           raise "missing :fk on link #{link.name.inspect}" if link && !link.fk
 
@@ -53,9 +53,11 @@ module PgGraphQl
 
           wheres = []
 
-          if ids && ids.to_s != "id"
+          raise "missing id for root type #{type.name.inspect}" if ((ids.is_a?(Array) && ids.empty?) || "#{ids}".empty?) && level == 1 && !type.null_pk
+
+          # if ids && ids.to_s != "id"
             wheres << type.pk.call(ids) if type.pk.call(ids)
-          end
+          # end
 
           wheres << ("(" + type.filter + ")") if type.filter
 
@@ -86,7 +88,7 @@ module PgGraphQl
 
         end.join
       else
-        wrap_root(query.map do |e|
+        wrap_root(query.map do |e|          
           sql = to_sql([e].to_h, 1)
           "select '#{e[0]}'::text as key, (#{sql}) as value"
         end.join("\nunion all\n"))
@@ -98,7 +100,7 @@ module PgGraphQl
     end
 
     class Type
-      attr_accessor :name, :table, :filter, :links, :order_by, :fields, :subtypes, :pk
+      attr_accessor :name, :table, :filter, :links, :order_by, :fields, :subtypes, :pk, :null_pk
       attr_reader :schema, :mappings
       def initialize(schema, name)
         @schema = schema
@@ -110,15 +112,20 @@ module PgGraphQl
         @links = {}
         @subtypes = {}
         @mappings = {}
+        @null_pk = false
         @pk = ->(ids) do
           if ids.is_a?(Array)
             if ids.empty?
               nil
             else
-              "id in (#{ids.join(',')})"
+              "id in (" + ids.map{|id| id.is_a?(String) ? "'#{id}'" : id.to_s}.join(',') + ")"
             end
           else
-            "id = #{ids}"
+            if "#{ids.to_s}".empty? || ids.to_s == "id"
+              nil
+            else
+              "id = " + (ids.is_a?(String) ? "'#{ids}'" : "#{ids}")
+            end
           end
         end
       end

data/test/test_pggraphql.rb

@@ -37,10 +37,34 @@ module PgGraphQl
       ), token(res)
     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|
+          s.type :user, fields: [:id, :email]
+        end
+      end
+    end
+
+    def test_simple_fail_without_pk
+      assert_raise_message "missing id for root type :user" do
+        res = to_sql({user: {email: "email"}}) do |s|
+          s.root :user
+          s.type :user, fields: [:id, :email]
+        end
+      end
+
+      assert_raise_message "missing id for root type :user" do
+        res = to_sql({user: {id: [], email: "email"}}) do |s|
+          s.root :user
+          s.type :user, fields: [:id, :email]
+        end
+      end
+    end
+
     def test_simple_pk_array_empty
       res = to_sql({user: {id: [], email: "email"}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email]
+        s.type :user, null_pk: true, fields: [:id, :email]
       end
 
       assert_equal token(<<-SQL
@@ -69,6 +93,37 @@ module PgGraphQl
       ), token(res)
     end
 
+    def test_simple_pk_type_handling
+      res = to_sql({user: {id: ["1"], email: "email"}}) do |s|
+        s.root :user
+        s.type :user, fields: [:id, :email]
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(coalesce(json_agg(x.*), '[]'::json))
+            from (select id,
+                  email
+                from users where id in ('1')) x) as value      
+      SQL
+      ), token(res)
+
+
+      res = to_sql({user: {id: "1", email: "email"}}) do |s|
+        s.root :user
+        s.type :user, fields: [:id, :email]
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select id,
+                  email
+                from users where id = '1' limit 1) x) as value      
+      SQL
+      ), token(res)
+    end
+
     def test_simple_pk_array_one
       res = to_sql({user: {id: [1], email: "email"}}) do |s|
         s.root :user
@@ -121,8 +176,9 @@ module PgGraphQl
     def test_simple_multiple
       res = to_sql({user: {id: 1, email: "email"}, educator: {id: "id"}}) do |s|
         s.root :user
+        s.root :educator
         s.type :user, fields: [:id, :email]
-        s.type :educator
+        s.type :educator, null_pk: true
       end
 
       assert_equal token(<<-SQL
@@ -168,7 +224,7 @@ module PgGraphQl
 
         s.type :order
 
-        s.type :product, fields: [:id, :type, :clickout__destination_url, :download__download_url] do |t|
+        s.type :product, null_pk: true, fields: [:id, :type, :clickout__destination_url, :download__download_url] do |t|
 
           t.map :id, "products.id"
 

metadata

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