pggraphql 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40388c39022da2118d8ffe8774012034c35e29c5
-  data.tar.gz: efba25021710edfe95ab788e60fde4013df55736
+  metadata.gz: a496c7dcb4e4874d467f306c9c09694fd7eb8cc0
+  data.tar.gz: 281ff55e808ed19658b7c83eeaeb45195387903c
 SHA512:
-  metadata.gz: 44b8bec7c4351cfa93d23c5b161b3131d1c3125e477f90db0185337831e3cca0dfe5dc3fad44c38facdd8f9f2b58912391ebd043ca2f3245a29f713bc22943a7
-  data.tar.gz: f725f47496545cf7c63889a145c50e53d5d14d7c260b30fb948f4886824d33e9e24e67427c814ae181f568dc95080dac80b3095144ecf9d08eefde33925c1336
+  metadata.gz: f51a3e077d8a80fe633a7a96599f023e4e55e8b537756ef3f19de3802caa0b354afdb957b40de31666bd510a9ca4bf18785307c93a3be7c56c2a7d7b61520631
+  data.tar.gz: c019677cec5606e7e842a01b1269d96851d9fda23f648fef1d277123e3af257bd46b6e893b1c1f4a2c04505dd725627b66cd79716b54218af4cf5bd02f37838b

data/lib/pggraphql.rb

@@ -145,7 +145,7 @@ module PgGraphQl
 
               column_expr_proc = -> do
                 if field_def[:expr]
-                  handle_sql_part(field_def[:expr].call(column_name), params, level, table_levels)
+                  handle_sql_part(field_def[:expr].call(column_name, e[1]), params, level, table_levels)
                 else
                   handle_sql_part("#{column_name}", params, level, table_levels)
                 end
@@ -295,7 +295,7 @@ module PgGraphQl
         @fields = fields.map{|f| create_field(f)}
       end
       def fields
-        @fields + [create_field({name: :id, as: nil, expr: ->(c){ "#{c}" }})] + (@subtypes.empty? ? [] : [create_field(:type)])
+        @fields + [create_field({name: :id, as: nil, expr: ->(c, query){ "#{c}" }})] + (@subtypes.empty? ? [] : [create_field(:type)])
       end
       def create_field(field)
         if field.is_a?(Symbol)

data/lib/pggraphql/version.rb

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

data/test/test_pggraphql.rb

@@ -158,6 +158,23 @@ module PgGraphQl
       ), token(res[:sql])
       assert_equal [], res[:params]
 
+      # ---
+
+      res = to_sql({user: {email: nil, other: nil, :"$custom" => {name: "bob"}}}) do |s|
+        s.root :user
+        s.type :user, null_pk: :array, fields: [:email, {name: :other, expr: ->(c, query){ "'#{query[:"$custom"][:name]}'" }}]
+      end
+
+      assert_equal token(<<-SQL
+        select 'user'::text as key,
+          (select to_json(coalesce(json_agg(x.*), '[]'::json))
+            from (select users1.id,
+                  users1.email as email,
+                  'bob' as other
+                from users as users1) x) as value
+      SQL
+      ), token(res[:sql])
+
     end
 
     def test_simple_igore_dollar_fields
@@ -216,10 +233,12 @@ module PgGraphQl
 
       # ----
 
-      res = to_sql({user: {id: 1, email: nil}}) do |s|
+      res = to_sql({user: {id: 1, email: nil, :"$custom" => {order: "email"}}}) do |s|
         s.root :user
         s.type :user, fields: [:email] do |t|
-          t.table_query = ->(query){ "select 1 as id, 'my@domain' as email" }
+          t.table_query = ->(query) do
+            "select 1 as id, 'my@domain' as email order by #{query[:"$custom"][:order]} desc"
+          end
         end
       end
 
@@ -228,7 +247,7 @@ module PgGraphQl
           (select to_json(x.*)
             from (select users1.id,
                   users1.email as email
-                from (select 1 as id, 'my@domain' as email) as users1
+                from (select 1 as id, 'my@domain' as email order by email desc) as users1
                 where users1.id = ? limit 1) x) as value
       SQL
       ), token(res[:sql])
@@ -591,7 +610,7 @@ module PgGraphQl
       res = to_sql({flow: {id: 1, data: nil}}) do |s|
         s.root :flow
         s.type :flow do |t|
-          t.fields = [{name: :data, expr: ->(c){ "to_json(#{c})" } }]
+          t.fields = [{name: :data, expr: ->(c, query){ "to_json(#{c})" } }]
         end
       end
 
@@ -606,7 +625,7 @@ module PgGraphQl
       res = to_sql({flow: {id: 1, data: nil}}) do |s|
         s.root :flow
         s.type :flow do |t|
-          t.fields = [{name: :data, as: nil, expr: ->(c){ "to_json(#{c})" } }]
+          t.fields = [{name: :data, as: nil, expr: ->(c, query){ "to_json(#{c})" } }]
         end
       end
 

metadata

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