pggraphql 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 310b215ed3294f252ba1a2c446438e1ef2eb36b6
-  data.tar.gz: f9e4f9aa456475b48f65053cff6859018113d8a2
+  metadata.gz: fdf0b9b66504b4787e8ec3e6928426228b531d61
+  data.tar.gz: c1435f3aaa8d96b2e8d420494d378072a6cded71
 SHA512:
-  metadata.gz: 9ea6027265481e57382bddd85d8cc1c737e8da6e31c9696802bc726ede7cd46e243dbea37b41087e9410cec981de57e32a6c8fdcae1b7aa1f9cca93cd5d7ca29
-  data.tar.gz: 52987c14f1c1427d0a242dbc3826c15815d387fa76617a566aedf161acdf2e40753df529b07590dd60b7edaf3869c6e66f14a819cb24c9448e28954019cc70e1
+  metadata.gz: 3d3b0514e72ca3c1dbdc2f92902c1b67537192c0970d82e950b8137b7a115eb2dc03ae13b4159041a890a028849d9df303bd9b7128658ab6b4a61c789ba934e2
+  data.tar.gz: 7f9dc9e43010a5cf019ba8567077b2751e8de9d22dbe16beb4e21afd0f547cf3df8a881a9b9caff547a9ca651e8078abf42811804331ec9527f43b81fc929a8f

data/lib/pggraphql/version.rb

@@ -1,3 +1,3 @@
 module Pggraphql
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/pggraphql.rb

@@ -30,15 +30,22 @@ 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 "missing :fk on link #{link.name.inspect}" if link && !link.fk
 
           columns = e[1].map do |f|
-            column_name = f[0]
+            nested_link_name = f[0]
+            field_name = f[0]
+
+            raise "unknown field #{field_name.inspect} on type #{type.name.inspect}" if !f[1].is_a?(Hash) && !type.fields.include?(field_name)
+            raise "unknown link #{field_name.inspect} on type #{type.name.inspect}" if f[1].is_a?(Hash) && !type.links.include?(field_name)
 
-            raise "unknown field #{column_name.inspect} on type #{type.name.inspect}" if !f[1].is_a?(Hash) && !type.fields.include?(column_name)
-            raise "unknown link #{column_name.inspect} on type #{type.name.inspect}" if f[1].is_a?(Hash) && !type.links.include?(column_name)
+            column_name = field_name.to_s.index("__") ? field_name.to_s.gsub(/__/, ".").to_sym : field_name
 
-            (f[1].is_a?(Hash) ? "(" + to_sql([f].to_h, level + 1, type, column_name) + ") as #{column_name}" : column_name.to_s)
+            column_expr = type.mappings[field_name] || column_name
+
+            (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)
@@ -66,6 +73,16 @@ 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 (#{subtype.fk})"
+            end.join("\n")
+          end
+
+
           sql += " where #{wheres.join(' and ')}" unless wheres.empty?
           sql += " order by #{order_by}" if order_by
           sql += " limit 1" if !is_many
@@ -85,8 +102,8 @@ module PgGraphQl
     end
 
     class Type
-      attr_accessor :name, :table, :filter, :links, :order_by, :fields
-      attr_reader :schema
+      attr_accessor :name, :table, :filter, :links, :order_by, :fields, :subtypes
+      attr_reader :schema, :mappings
       def initialize(schema, name)
         @schema = schema
         @name = name
@@ -95,6 +112,11 @@ module PgGraphQl
         @filter = nil
         @order_by = nil
         @links = {}
+        @subtypes = {}
+        @mappings = {}
+      end
+      def map(field, column_expr)
+        @mappings[field] = column_expr
       end
       def one(name, opts={})
         create_link(name, false, opts)
@@ -102,6 +124,13 @@ module PgGraphQl
       def many(name, opts={})
         create_link(name, true, opts)
       end
+      def subtype(name, opts={})
+        subtype = @subtypes[name] = SubType.new(self, name)
+        opts.each_pair do |key, val| 
+          subtype.send(:"#{key}=", val)
+        end
+        subtype
+      end
       def create_link(name, many, opts)
         link = @links[name] = Link.new(self, name, many)
         opts.each_pair do |key, val| 
@@ -111,6 +140,16 @@ module PgGraphQl
       end
     end
 
+    class SubType
+      attr_accessor :name, :table, :fk
+      def initialize(type, name)
+        @type = type
+        @name = name
+        @table = nil
+        @fk = nil
+      end
+    end
+
     class Link
       attr_accessor :name, :filter, :fk, :order_by
       def initialize(owner, name, many)

data/test/test_pggraphql.rb

@@ -125,9 +125,74 @@ module PgGraphQl
       ), token(res)
     end
 
-    # #####################
-    # # one
-    # #####################
+    #####################
+    # inherit
+    #####################
+
+    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"
+            }
+          }
+        }
+      }) do |s|
+        s.root :product
+
+        s.type :user, fields: [:id, :email] do |t|
+          t.many :orders, fk: "user_id = users.id"
+        end
+
+        s.type :order
+
+        s.type :product, fields: [:id, :type, :clickout__destination_url, :download__download_url] do |t|
+
+          t.map :id, "products.id"
+
+          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
+        select 'products'::text as key,
+          (select to_json(coalesce(json_agg(x.*), '[]'::json))
+            from (select products.id as 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 id,
+                          (select to_json(coalesce(json_agg(x.*), '[]'::json))
+                            from (select id
+                                from orders
+                                where (user_id = users.id)) x) as orders
+                        from users
+                        where (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)
+      
+    end
+
+
+    #####################
+    # one
+    #####################
 
 
     def test_link_one

metadata

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