Merge branch 'master' into cud-mutations

ajsharp · ajsharp · commit fcade6d903e6 · 2020-01-02T17:52:24.000-08:00
diff --git a/lib/generators/gql/gql_generator_base.rb b/lib/generators/gql/gql_generator_base.rb
@@ -20,7 +20,8 @@ def type_map
           decimal: 'Float',
           datetime: 'GraphQL::Types::ISO8601DateTime',
           date: 'GraphQL::Types::ISO8601Date',
-          hstore: 'GraphQL::Types::JSON'
+          hstore: 'GraphQL::Types::JSON',
+          text: 'String'
         }
       end
   

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ def type_map`
`20`	`20`	`decimal: 'Float',`
`21`	`21`	`datetime: 'GraphQL::Types::ISO8601DateTime',`
`22`	`22`	`date: 'GraphQL::Types::ISO8601Date',`
`23`		`- hstore: 'GraphQL::Types::JSON'`
	`23`	`+ hstore: 'GraphQL::Types::JSON',`
	`24`	`+ text: 'String'`
`24`	`25`	`}`
`25`	`26`	`end`
`26`	`27`