pggraphql 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1435a943bfa68882db3826bb0f70561db6ad90cb
-  data.tar.gz: 9efca16a8d0c08f171162645661b541248cc70bb
+  metadata.gz: 30009a5c466252f930ace1828c0111d0e6f78fd4
+  data.tar.gz: 51f4d7fdf7d354cc81797c11abf22c3c54a224ee
 SHA512:
-  metadata.gz: 592df918ac04b3f7c4b1201c0c2d7088f5888296a62d968a041a98fd99463a1dac132f466fb1c76ae4e5536595687674aab8082221f91be40fd9a4a88a5bb59f
-  data.tar.gz: 4bf4ac82696eb398dba7752a92f2605ebfa5d3c17daf3011fcd895e388ba369565803a29e6de06bddac3554555321aff32bd63cb697b03df59085b4559d77ab5
+  metadata.gz: 801bdabcbd2cb22177ed107c71a7eb49dbc968f27c10fe25f864d72b0ebb0da580d58daefb86c8921e84263aa9f51f6e9dce684f93417c4015c3b59b0c770d67
+  data.tar.gz: 6a8c862a0bee46b0f4248c795ba64c7814054f507f66962bef395d9b95b2835711574f978f8d168b7c86d8fb41b4a731ac897350856d0087988d54f7834718b9

data/lib/pggraphql/version.rb

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

data/lib/pggraphql.rb

@@ -42,6 +42,8 @@ module PgGraphQl
           type = link ? link.type : self.types[e[0].to_s.split("@").first.singularize.to_sym]
           ids = e[1][:id]
 
+          raise "type not found: #{e[0]}; link_name: #{link_name}" unless 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?
 
@@ -69,7 +71,7 @@ module PgGraphQl
               # column_expr = type.mappings[field_name] || column_name
 
               column_expr = if field_def[:expr]
-                field_def[:expr].call(column_name)
+                handle_sql_part(field_def[:expr].call(column_name), params)
               else
                 column_name
               end
@@ -97,7 +99,21 @@ module PgGraphQl
           wheres << ("(" + handle_sql_part(type.filter, params) + ")") if type.filter
 
           if link
-            wheres << ("(" + handle_sql_part(link.fk, params) + ")")
+            fk = link.fk.is_a?(Proc) ? link.fk.call(level) : link.fk
+
+            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
+            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
+            end
+
+            wheres << ("(" + handle_sql_part(fk, params) + ")")
             wheres << ("(" + handle_sql_part(link.filter, params) + ")") if link.filter
           end
 
@@ -106,12 +122,17 @@ module PgGraphQl
           sql += "x.*"
           sql += "), '[]'::json)" if is_many
           sql += ") from (select #{columns} from #{type.table}"
-
         
           unless type.subtypes.empty?
             sql += "\n" + type.subtypes.map do |f|
               subtype = f[1]
-              "left join #{subtype.table} as #{subtype.name} on (#{handle_sql_part(subtype.fk, params)})"
+              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
+
+              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)})"
             end.join("\n")
           end
 
@@ -184,14 +205,24 @@ module PgGraphQl
       def one(name, opts={})
         create_link(name, false, opts)
       end
+
+      def has_one(name, opts={})
+        one(name, opts.merge({fk: :has_one}))
+      end
+
+      def belongs_to(name, opts={})
+        one(name, opts.merge({fk: :belongs_to}))
+      end
+
       def many(name, opts={})
-        create_link(name, true, opts)
+        create_link(name, true, {fk: :many}.merge(opts))
       end
       def subtype(name, opts={})
         subtype = @subtypes[name] = SubType.new(self, name)
-        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?
         subtype
       end
       def create_link(name, many, opts)
@@ -205,12 +236,25 @@ module PgGraphQl
 
     class SubType
       attr_accessor :name, :table, :fk
+      attr_reader :type
       def initialize(type, name)
         @type = type
         @name = name
         @table = nil
         @fk = nil
       end
+      def has_one(name, opts={})
+        @type.has_one(:"#{@name}__#{name}", {type: name}.merge(opts))
+      end
+      def belongs_to(name, opts={})
+        @type.belongs_to(:"#{@name}__#{name}", {type: name}.merge(opts))
+      end
+      def one(name, opts={})
+        @type.one(:"#{@name}__#{name}", {type: name}.merge(opts))
+      end
+      def many(name, opts={})
+        @type.many(:"#{@name}__#{name}", {type: name}.merge(opts))
+      end
     end
 
     class Link

data/test/test_pggraphql.rb

@@ -353,21 +353,16 @@ module PgGraphQl
         }
       }) 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
@@ -393,6 +388,105 @@ module PgGraphQl
       SQL
       ), token(res[:sql])
       assert_equal [], res[:params]
+
+      # ------
+
+      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
+        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
+          t.subtype :clickout, table: :product_clickouts
+          t.many :download__users, type: :user
+        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 (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
+      SQL
+      ), token(res[:sql])
+      assert_equal [], res[:params]    
+
+      # ------
+
+      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
+        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 do |st|
+            st.many :users, type: :user
+          end
+          t.subtype :clickout, table: :product_clickouts
+        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 (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
+      SQL
+      ), token(res[:sql])
+      assert_equal [], res[:params]          
     end
 
     def test_inherit_with_pk
@@ -426,6 +520,105 @@ module PgGraphQl
     # one
     #####################
 
+    def test_link_belongs_to
+      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
+        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.id = users.address_id) limit 1) x) as "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_belongs_to___name_different_from_type
+      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
+        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.id = users.other_address_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___name_different_from_type
+      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
+        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 "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_one
       res = to_sql({user: {id: 1, email: "email", address: {id: "99"}}}) do |s|
@@ -677,6 +870,56 @@ module PgGraphQl
       SQL
       ), token(res[:sql])
       assert_equal ["99", 1], res[:params]
+
+      # ----
+
+      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
+        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(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
+      SQL
+      ), token(res[:sql])
+      assert_equal ["99", 1], res[:params]
+
+      # ----
+
+      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
+        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(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
+      SQL
+      ), token(res[:sql])
+      assert_equal ["99", 1], res[:params]
     end
 
     def test_link_many_nested_pk

metadata

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