pggraphql 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50e64d160c0600af362f81584ad44a4a7f78d591
-  data.tar.gz: 632dcd3c7395989a483f937fb9da7f01858a7a2f
+  metadata.gz: 9fea48a5522b0f0f471725feb12317d463f78cd6
+  data.tar.gz: f9475b2bb5ee21271dd7b3695cde9ca35f0b2f32
 SHA512:
-  metadata.gz: 6564555082bb0560edad1f28a701ea0aca4ef097adfb2a03105071cfc43321361d9855b3a81ac182edf58a11409da8bf8edbb9ec20f4402a3df489de06f1fa02
-  data.tar.gz: 5cf566b528dfd0262cf42dea969d2bd655f134fc48b4429af2fef054035aae70cc2e72ce487b0e57ce20e6f3a7d21d6a8d5bf06885bd720ad2314e7d754dc373
+  metadata.gz: eb7ac6feeff8448154dd3b4dbde792e9df29e901d2756f459e2325027857d9d783ea11f84b6ccb6e2988c4cec6fc1a78dd0c36b29406a80b79e1eb41e7ae771a
+  data.tar.gz: a050ca27622558a21c81e9199922bee8c2efef2ff2343dda8d735ad95d668ad430b8224f91a366ad6e548e4c8118bd3af1b02b88f39b036763533fd0c9e62432

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pggraphql (0.0.1)
+    pggraphql (0.0.6)
       activesupport
       json
 

data/lib/pggraphql/version.rb

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

data/lib/pggraphql.rb

@@ -30,11 +30,14 @@ module PgGraphQl
           type = link ? link.type : self.types[e[0].to_s.singularize.to_sym]
           ids = e[1][:id]
 
-          raise "#{type.name.inspect} is not a root type" if level == 1 && !@roots.include?(type)
+          raise "found :id with without value on type #{type.name.inspect}" if e[1].key?(:id) && ids.nil?
+          raise "found empty :id array on type #{type.name.inspect}" if e[1].key?(:id) && ids.is_a?(Array) && ids.empty?
+
 
+          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
 
-          columns = e[1].map do |f|
+          columns = {id: nil}.merge(e[1]).map do |f|
             nested_link_name = f[0]
             field_name = f[0]
 
@@ -48,16 +51,15 @@ module PgGraphQl
             (f[1].is_a?(Hash) ? "(" + to_sql([f].to_h, level + 1, type, nested_link_name) + ") as #{field_name}" : ((column_name == field_name && column_name == column_expr) ? column_name.to_s : "#{column_expr} as #{field_name}"))
           end.join(",")
 
-          is_many = (link && link.many?) || !ids || ids.is_a?(Array)
+          # is_many = (link && link.many?) || ids.is_a?(Array) || (level == 1 && !ids && type.null_pk == :array)
+          is_many = (link && link.many?) || (level == 1 && ids.is_a?(Array)) || (level == 1 && !ids && type.null_pk == :array)
           order_by = link.try(:order_by) || type.try(:order_by)
 
           wheres = []
 
-          raise "missing id for root type #{type.name.inspect}" if ((ids.is_a?(Array) && ids.empty?) || "#{ids}".empty?) && level == 1 && !type.null_pk
+          raise "missing :id for root type #{type.name.inspect}" if !ids && level == 1 && !type.null_pk
 
-          # if ids && ids.to_s != "id"
-            wheres << type.pk.call(ids) if type.pk.call(ids)
-          # end
+          wheres << type.pk.call(ids) if ids && type.pk.call(ids)
 
           wheres << ("(" + type.filter + ")") if type.filter
 
@@ -100,8 +102,8 @@ module PgGraphQl
     end
 
     class Type
-      attr_accessor :name, :table, :filter, :links, :order_by, :fields, :subtypes, :pk, :null_pk
-      attr_reader :schema, :mappings
+      attr_accessor :name, :table, :links, :order_by, :filter, :subtypes, :pk, :null_pk
+      attr_reader :schema, :mappings, :fields
       def initialize(schema, name)
         @schema = schema
         @name = name
@@ -115,20 +117,15 @@ module PgGraphQl
         @null_pk = false
         @pk = ->(ids) do
           if ids.is_a?(Array)
-            if ids.empty?
-              nil
-            else
-              "id in (" + ids.map{|id| id.is_a?(String) ? "'#{id}'" : id.to_s}.join(',') + ")"
-            end
+            "id in (" + ids.map{|id| id.is_a?(String) ? "'#{id}'" : id.to_s}.join(',') + ")"
           else
-            if "#{ids.to_s}".empty? || ids.to_s == "id"
-              nil
-            else
-              "id = " + (ids.is_a?(String) ? "'#{ids}'" : "#{ids}")
-            end
+            "id = " + (ids.is_a?(String) ? "'#{ids}'" : "#{ids}")
           end
         end
       end
+      def fields=(fields)
+        @fields = (fields + [:id]).uniq
+      end
       def map(field, column_expr)
         @mappings[field] = column_expr
       end

data/test/test_pggraphql.rb

@@ -35,6 +35,39 @@ module PgGraphQl
                 where id = 1 limit 1) x) as value      
       SQL
       ), token(res)
+
+      # ---
+
+      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 id,
+                  email
+                from users
+                where id = 1 limit 1) x) as value      
+      SQL
+      ), token(res)
+
+      # ---
+
+      res = to_sql({user: {email: "email"}}) do |s|
+        s.root :user
+        s.type :user, null_pk: :array, fields: [: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) x) as value      
+      SQL
+      ), token(res)
     end
 
     def test_simple_fail_when_accessing_non_root
@@ -46,14 +79,14 @@ module PgGraphQl
     end
 
     def test_simple_fail_without_pk
-      assert_raise_message "missing id for root type :user" do
+      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
+      assert_raise_message "found empty :id array on type :user" do
         res = to_sql({user: {id: [], email: "email"}}) do |s|
           s.root :user
           s.type :user, fields: [:id, :email]
@@ -61,26 +94,10 @@ module PgGraphQl
       end
     end
 
-    def test_simple_pk_array_empty
-      res = to_sql({user: {id: [], email: "email"}}) do |s|
-        s.root :user
-        s.type :user, null_pk: true, 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) x) as value      
-      SQL
-      ), token(res)
-    end
-
     def test_simple_pk_custom
       res = to_sql({user: {id: "1", email: "email"}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email], pk: ->(id){ "access_token = '#{id}'" }
+        s.type :user, fields: [:email], pk: ->(id){ "access_token = '#{id}'" }
       end
 
       assert_equal token(<<-SQL
@@ -96,7 +113,7 @@ module PgGraphQl
     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]
+        s.type :user, fields: [:email]
       end
 
       assert_equal token(<<-SQL
@@ -111,7 +128,7 @@ module PgGraphQl
 
       res = to_sql({user: {id: "1", email: "email"}}) do |s|
         s.root :user
-        s.type :user, fields: [:id, :email]
+        s.type :user, fields: [:email]
       end
 
       assert_equal token(<<-SQL
@@ -154,6 +171,22 @@ module PgGraphQl
                 from users where id in (1,2)) x) as value      
       SQL
       ), token(res)
+
+      # ---
+
+      res = to_sql({user: {id: ['1','2'], 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','2')) x) as value      
+      SQL
+      ), token(res)
     end
 
     def test_simple_filter
@@ -174,7 +207,7 @@ module PgGraphQl
     end
 
     def test_simple_multiple
-      res = to_sql({user: {id: 1, email: "email"}, educator: {id: "id"}}) do |s|
+      res = to_sql({user: {id: 1, email: "email"}, educator: {id: 99}}) do |s|
         s.root :user
         s.root :educator
         s.type :user, fields: [:id, :email]
@@ -192,7 +225,7 @@ module PgGraphQl
         select 'educator'::text as key,
           (select to_json(x.*)
             from (select id
-                from educators limit 1) x) as value
+                from educators where id = 99 limit 1) x) as value
       SQL
       ), token(res)
     end
@@ -204,15 +237,11 @@ module PgGraphQl
     def test_inherit
       res = to_sql({
         products: {
-          id: [], 
           type: nil,
           clickout__destination_url: nil,
           download__download_url: nil,
           download__users: {
-            id: "id",
-            orders: {
-              id: "id"
-            }
+            orders: {}
           }
         }
       }) do |s|
@@ -224,7 +253,7 @@ module PgGraphQl
 
         s.type :order
 
-        s.type :product, null_pk: true, fields: [:id, :type, :clickout__destination_url, :download__download_url] do |t|
+        s.type :product, null_pk: :array, fields: [:type, :clickout__destination_url, :download__download_url] do |t|
 
           t.map :id, "products.id"
 
@@ -268,7 +297,31 @@ module PgGraphQl
 
 
     def test_link_one
-      res = to_sql({user: {id: 1, email: "email", address: {id: "id"}}}) do |s|
+      res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
+        s.root :user
+        s.type :user, fields: [:id, :email] do |t|
+          t.one :address, fk: "id = users.address_id"
+        end
+        s.type :address
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select id,
+                  email,
+                  (select to_json(x.*)
+                    from (select id
+                        from addresses
+                        where id = '99' and (id = users.address_id) limit 1) x) as address
+                from users
+                where id = 1 limit 1) x) as value
+      SQL
+      ), token(res)
+    end
+
+    def test_link_one_nested_pk
+      res = to_sql({user: {id: 1, email: "email", address: {id: 99}}}) do |s|
         s.root :user
         s.type :user, fields: [:id, :email] do |t|
           t.one :address, fk: "id = users.address_id"
@@ -276,6 +329,51 @@ module PgGraphQl
         s.type :address
       end
 
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select id,
+                  email,
+                  (select to_json(x.*)
+                    from (select id
+                        from addresses
+                        where id = 99 and (id = users.address_id) limit 1) x) as address
+                from users
+                where id = 1 limit 1) x) as value
+      SQL
+      ), token(res)
+
+      res = to_sql({user: {id: 1, email: "email", address: {id: [99,999]}}}) do |s|
+        s.root :user
+        s.type :user, fields: [:id, :email] do |t|
+          t.one :address, fk: "id = users.address_id"
+        end
+        s.type :address
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select id,
+                  email,
+                  (select to_json(x.*)
+                    from (select id
+                        from addresses
+                        where id in (99,999) and (id = users.address_id) limit 1) x) as address
+                from users
+                where id = 1 limit 1) x) as value
+      SQL
+      ), token(res)    end
+
+    def test_link_one_empty_fields
+      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"
+        end
+        s.type :address
+      end
+
       assert_equal token(<<-SQL
         select 'user'::text as key,
           (select to_json(x.*)
@@ -305,7 +403,7 @@ module PgGraphQl
 
 
     def test_link_one_fk_sql
-      res = to_sql({user: {id: 1, email: "email", address: {id: "id"}}}) do |s|
+      res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:id, :email] do |t|
           t.one :address, fk: "id = (select 100)"
@@ -321,7 +419,7 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select id
                         from addresses
-                        where (id = (select 100)) limit 1) x) as address
+                        where id = '99' and (id = (select 100)) limit 1) x) as address
                 from users
                 where id = 1 limit 1) x) as value
       SQL
@@ -329,7 +427,7 @@ module PgGraphQl
     end
 
     def test_link_one_filter
-      res = to_sql({user: {id: 1, email: "email", address: {id: "id"}}}) do |s|
+      res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:id, :email] do |t|
           t.one :address, fk: "user_id = users.id", filter: "id > 100"
@@ -345,7 +443,7 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select id
                         from addresses
-                        where (user_id = users.id) and (id > 100) limit 1) x) as address
+                        where id = '99' and (user_id = users.id) and (id > 100) limit 1) x) as address
                 from users
                 where id = 1 limit 1) x) as value
       SQL
@@ -353,7 +451,7 @@ module PgGraphQl
     end
 
     def test_link_one_order_by
-      res = to_sql({user: {id: 1, email: "email", address: {id: "id"}}}) do |s|
+      res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:id, :email] do |t|
           t.one :address, fk: "user_id = users.id", order_by: "id desc"
@@ -369,19 +467,19 @@ module PgGraphQl
                   (select to_json(x.*)
                     from (select id
                         from addresses
-                        where (user_id = users.id) order by id desc limit 1) x) as address
+                        where id = '99' and (user_id = users.id) order by id desc limit 1) x) as address
                 from users
                 where id = 1 limit 1) x) as value
       SQL
       ), token(res)
     end
 
-    # #####################
-    # # one-in-one
-    # #####################
+    #####################
+    # one-in-one
+    #####################
 
     def test_link_one_in_one
-      res = to_sql({user: {id: 1, email: "email", address: {id: "id", country: {id: "id"}}}}) do |s|
+      res = to_sql({user: {id: 1, email: "email", address: {country: {}}}}) do |s|
         s.root :user
         s.type :user, fields: [:id, :email] do |t|
           t.one :address, fk: "user_id = users.id"
@@ -411,13 +509,61 @@ module PgGraphQl
       ), token(res)
     end
 
-    # #####################
-    # # many
-    # #####################
+    #####################
+    # many
+    #####################
 
 
     def test_link_many
-      res = to_sql({user: {id: 1, email: "email", address: {id: "id"}}}) do |s|
+      res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
+        s.root :user
+        s.type :user, fields: [:id, :email] do |t|
+          t.many :address, fk: "user_id = users.id"
+        end
+        s.type :address
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select id,
+                  email,
+                  (select to_json(coalesce(json_agg(x.*), '[]'::json))
+                    from (select id
+                        from addresses
+                        where id = '99' and (user_id = users.id)) x) as address
+                from users
+                where id = 1 limit 1) x) as value
+      SQL
+      ), token(res)
+    end
+
+    def test_link_many_nested_pk
+      res = to_sql({user: {id: 1, email: "email", address: {id: ["99","999"]}}}) do |s|
+        s.root :user
+        s.type :user, fields: [:id, :email] do |t|
+          t.many :address, fk: "user_id = users.id"
+        end
+        s.type :address
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select id,
+                  email,
+                  (select to_json(coalesce(json_agg(x.*), '[]'::json))
+                    from (select id
+                        from addresses
+                        where id in ('99','999') and (user_id = users.id)) x) as address
+                from users
+                where id = 1 limit 1) x) as value
+      SQL
+      ), token(res)
+    end
+
+    def test_link_many_empty_fields
+      res = to_sql({user: {id: 1, email: "email", address: {}}}) do |s|
         s.root :user
         s.type :user, fields: [:id, :email] do |t|
           t.many :address, fk: "user_id = users.id"
@@ -441,7 +587,7 @@ module PgGraphQl
     end
 
     def test_link_many_filter
-      res = to_sql({user: {id: 1, email: "email", address: {id: "id"}}}) do |s|
+      res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:id, :email] do |t|
           t.many :address, fk: "user_id = users.id", filter: "id % 2 = 0"
@@ -457,7 +603,7 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select id
                         from addresses
-                        where (user_id = users.id) and (id % 2 = 0)) x) as address
+                        where id = '99' and (user_id = users.id) and (id % 2 = 0)) x) as address
                 from users
                 where id = 1 limit 1) x) as value
       SQL
@@ -465,7 +611,7 @@ module PgGraphQl
     end
 
     def test_link_many_order_by
-      res = to_sql({user: {id: 1, email: "email", address: {id: "id"}}}) do |s|
+      res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
         s.root :user
         s.type :user, fields: [:id, :email] do |t|
           t.many :address, fk: "user_id = users.id", order_by: "id desc"
@@ -481,7 +627,7 @@ module PgGraphQl
                   (select to_json(coalesce(json_agg(x.*), '[]'::json))
                     from (select id
                         from addresses
-                        where (user_id = users.id) order by id desc) x) as address
+                        where id = '99' and (user_id = users.id) order by id desc) x) as address
                 from users
                 where id = 1 limit 1) x) as value
       SQL

metadata

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