pggraphql 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99fb888e996dd5a6d047dfe87d4b486aa5bdc1ba
-  data.tar.gz: c213c7424178a7f0471e7992d47cdb81712b343a
+  metadata.gz: 40388c39022da2118d8ffe8774012034c35e29c5
+  data.tar.gz: efba25021710edfe95ab788e60fde4013df55736
 SHA512:
-  metadata.gz: cd11586d6134db20251c457d277f99e5c2e5d3efe7fa472798d5a41dd2680c0fe11c18e288074622956e5035b004139340c65e3ece5a9bc032fcd55e6a74dbc6
-  data.tar.gz: 69bc3ba9ca3f7e081c743ae483208fd109e8da9dafe218e109847e1726207fdbe604314d31bc80ec11bbd617f4273b3d611e9c57dd3eace0907ef93c5cb4ee0d
+  metadata.gz: 44b8bec7c4351cfa93d23c5b161b3131d1c3125e477f90db0185337831e3cca0dfe5dc3fad44c38facdd8f9f2b58912391ebd043ca2f3245a29f713bc22943a7
+  data.tar.gz: f725f47496545cf7c63889a145c50e53d5d14d7c260b30fb948f4886824d33e9e24e67427c814ae181f568dc95080dac80b3095144ecf9d08eefde33925c1336

data/lib/pggraphql/version.rb

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

data/lib/pggraphql.rb

@@ -104,7 +104,7 @@ module PgGraphQl
 
           requested_fields = {id: nil} # always add :id field
           requested_fields = requested_fields.merge(type: nil) unless type.subtypes.empty? # always add :subtype
-          requested_fields = requested_fields.merge(e[1])
+          requested_fields = requested_fields.merge(e[1].reject{|f| f.to_s =~ /^\$/})
 
           columns = requested_fields.map do |f|
             nested_link_name = f[0]
@@ -169,6 +169,30 @@ module PgGraphQl
           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)
 
+          table_query = if type.table_query
+            sql_part = type.table_query.is_a?(Proc) ? type.table_query.call(e[1]) : type.table_query
+            "(" + handle_sql_part(sql_part, params, level, table_levels).to_s + ")"
+          else
+            type.table.to_s
+          end
+
+          subtypes = type.subtypes.map do |f|
+            subtype = f[1]
+            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_table_query = if subtype.table_query
+              "(" + handle_sql_part(subtype.table_query, params, level, table_levels).to_s + ")"
+            else
+              subtype.table.to_s
+            end
+
+            subtype_as = handle_sql_part("{#{subtype.name}}", params, level, table_levels)
+
+            "left join #{subtype_table_query} as #{subtype_as} on (#{handle_sql_part(fk, params, level, table_levels)})"
+          end
+
           wheres = []
 
           raise "missing :id for root type #{type.name.inspect}" if !ids && level == 1 && !type.null_pk
@@ -204,20 +228,22 @@ module PgGraphQl
           sql += "coalesce(json_agg(" if is_many
           sql += "x.*"
           sql += "), '[]'::json)" if is_many
-          sql += ") from (select #{columns} from #{type.table} as #{table_as}"
+          sql += ") from (select #{columns} from #{table_query} as #{table_as}"
 
-          unless type.subtypes.empty?
-            sql += "\n" + type.subtypes.map do |f|
-              subtype = f[1]
-              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 = handle_sql_part("{#{subtype.name}}", params, level, table_levels)
+          sql += "\n" + subtypes.join("\n") unless subtypes.empty?
 
-              "left join #{subtype.table} as #{subtype_as} on (#{handle_sql_part(fk, params, level, table_levels)})"
-            end.join("\n")
-          end
+          # unless type.subtypes.empty?
+          #   sql += "\n" + type.subtypes.map do |f|
+          #     subtype = f[1]
+          #     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 = handle_sql_part("{#{subtype.name}}", params, level, table_levels)
 
+          #     "left join #{subtype.table} as #{subtype_as} on (#{handle_sql_part(fk, params, level, table_levels)})"
+          #   end.join("\n")
+          # end
 
           sql += " where #{wheres.join(' and ')}" unless wheres.empty?
           sql += " order by #{handle_sql_part(order_by, params, level, table_levels)}" if order_by
@@ -240,12 +266,13 @@ module PgGraphQl
     end
 
     class Type
-      attr_accessor :name, :table, :links, :order_by, :filter, :subtypes, :pk, :null_pk
+      attr_accessor :name, :table, :table_query, :links, :order_by, :filter, :subtypes, :pk, :null_pk
       attr_reader :schema, :mappings, :fields
       def initialize(schema, name)
         @schema = schema
         @name = name
         @table = name.to_s.pluralize.to_sym
+        @table_query = nil
         @fields = []
         @filter = nil
         @order_by = nil
@@ -315,13 +342,14 @@ module PgGraphQl
     end
 
     class SubType
-      attr_accessor :name, :table, :fk
+      attr_accessor :name, :table, :fk, :table_query
       attr_reader :type
       def initialize(type, name)
         @type = type
         @name = name
         @table = nil
         @fk = nil
+        @table_query = nil
       end
       def has_one(name, opts={})
         @type.has_one(:"#{@name}__#{name}", {type: name}.merge(opts))

data/test/test_pggraphql.rb

@@ -160,6 +160,101 @@ module PgGraphQl
 
     end
 
+    def test_simple_igore_dollar_fields
+      res = to_sql({user: {id: 1, email: nil, :"$custom" => nil}}) 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 users1.id,
+                  users1.email as email
+                from users as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+    end
+
+    def test_simple_table_query
+      res = to_sql({user: {id: 1, email: nil}}) do |s|
+        s.root :user
+        s.type :user, fields: [:email] do |t|
+          t.table_query = "select 1 as id, 'my@domain' as email"
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select users1.id,
+                  users1.email as email
+                from (select 1 as id, 'my@domain' as email) as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+
+      # ----
+
+      res = to_sql({user: {id: 1, email: nil}}) do |s|
+        s.root :user
+        s.type :user, fields: [:email] do |t|
+          t.table_query = "select 1 as id, 'my@domain' as email where {users}.id > 0"
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select users1.id,
+                  users1.email as email
+                from (select 1 as id, 'my@domain' as email where users1.id > 0) as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+
+      # ----
+
+      res = to_sql({user: {id: 1, email: nil}}) do |s|
+        s.root :user
+        s.type :user, fields: [:email] do |t|
+          t.table_query = ->(query){ "select 1 as id, 'my@domain' as email" }
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select users1.id,
+                  users1.email as email
+                from (select 1 as id, 'my@domain' as email) as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+    end
+
+    def test_simple_table_query_with_params
+      res = to_sql({user: {id: 1, email: nil}}) do |s|
+        s.root :user
+        s.type :user, fields: [:email] do |t|
+          t.table_query = ["select ? as id, 'my@domain' as email", 99]
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(x.*)
+            from (select users1.id,
+                  users1.email as email
+                from (select ? as id, 'my@domain' as email) as users1
+                where users1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+
+      assert_equal [99, 1], res[:params]
+    end
+
     def test_guard_field
       res = to_sql({user: {id: 1, email: nil}}) do |s|
         s.root :user
@@ -655,6 +750,66 @@ module PgGraphQl
 
     end
 
+    def test_inherit_with_table_query
+      res = to_sql({
+        products: {
+          id: 1,
+          clickout__destination_url: nil
+        }
+      }) do |s|
+        s.root :product
+        s.type :product, null_pk: :array, fields: [:clickout__destination_url] do |t|
+          t.subtype :clickout, table: :product_clickouts do |st|
+            st.table_query = <<-SQL
+              select 1 as id, 'someurl' as destination_url
+            SQL
+          end
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'products'::text as key,
+          (select to_json(x.*)
+            from (select products1.id,
+                  products1.type as type,
+                  clickout1.destination_url as clickout__destination_url
+                from products as products1
+                left join (select 1 as id, 'someurl' as destination_url) as clickout1 on (clickout1.id = products1.id
+                    and products1.type = 'clickout') where products1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+      assert_equal [1], res[:params]
+
+      # ----
+
+      res = to_sql({
+        products: {
+          id: 1,
+          clickout__destination_url: nil
+        }
+      }) do |s|
+        s.root :product
+        s.type :product, null_pk: :array, fields: [:clickout__destination_url] do |t|
+          t.subtype :clickout, table: :product_clickouts do |st|
+            st.table_query = ["select 1 as id, ? as destination_url", "someurl"]
+          end
+        end
+      end
+
+      assert_equal token(<<-SQL
+        select 'products'::text as key,
+          (select to_json(x.*)
+            from (select products1.id,
+                  products1.type as type,
+                  clickout1.destination_url as clickout__destination_url
+                from products as products1
+                left join (select 1 as id, ? as destination_url) as clickout1 on (clickout1.id = products1.id
+                    and products1.type = 'clickout') where products1.id = ? limit 1) x) as value
+      SQL
+      ), token(res[:sql])
+      assert_equal ["someurl", 1], res[:params]
+    end
+
     #####################
     # one
     #####################

metadata

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