hq-graphql 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 981f1e51c20c41befde482f0ab312887f597727265508b2f8b4290420c91e2e1
-  data.tar.gz: 3038b46301c4b612a99988ba7fe9aa66aadc401a7a8a4ea8a959b3e8c23e8743
+  metadata.gz: 9dd3d2f47411b616e76f20e118b4a959af58a13223b5d8e758bb35919c5b2b02
+  data.tar.gz: 781c03507b71570f5e9c6b9dc34117f34649097d1e4026701fd740c78209acad
 SHA512:
-  metadata.gz: 30e473198ed03eaf14a9a4c9730c2a5816f5914dc745ef1fe0acc0b8e16f6a0b9b1f80bb2861fcb7bec16a5a0860bca1197b54892450686e545ef04f4f141611
-  data.tar.gz: e4b0b57d5674e48fe75ec61de48cf484425b504500b1e201322650211856de5557da6353f95907d77bb41bf0b41ef52c0434349d805dc8b29fec27eb0182c57c
+  metadata.gz: f5be4f443b74567f67e082cec1ae52d83f3adb0b2ae7964afb2f49e74467ed0185c04f34f363f3a0bb153e97bf90c7d8eff2e831d9d137cb1ca7c669b9af2ac8
+  data.tar.gz: aecd6fcaf3f269d0bf2d7504cdebf4e022fd5e4c670d9ad5153f1658d127ba12ca0661711d7cfd1863615d0b94b7ab2098dd5d8e22a8fbb7271a41f5f5a89da5

data/lib/hq/graphql/active_record_extensions.rb

@@ -124,6 +124,10 @@ module HQ
           @removed_associations ||= []
         end
 
+        def camelize(name)
+          name.to_s.camelize(:lower)
+        end
+
         def is_enum?(association)
           ::HQ::GraphQL.enums.include?(association.klass)
         end

data/lib/hq/graphql/input_object.rb

@@ -67,6 +67,7 @@ module HQ
           is_enum = is_enum?(association)
           input_or_type = is_enum ? ::HQ::GraphQL::Types[association.klass] : ::HQ::GraphQL::Inputs[association.klass]
           name = association.name
+          return if argument_exists?(name)
 
           case association.macro
           when :has_many
@@ -87,7 +88,13 @@ module HQ
         end
 
         def argument_from_column(column)
-          argument column.name, ::HQ::GraphQL::Types.type_from_column(column), required: false
+          name = column.name
+          return if argument_exists?(name)
+          argument name, ::HQ::GraphQL::Types.type_from_column(column), required: false
+        end
+
+        def argument_exists?(name)
+          !!arguments[camelize(name)]
         end
       end
     end

data/lib/hq/graphql/object.rb

@@ -65,7 +65,7 @@ module HQ
         def field_from_association(association, auto_nil:, internal_association: false, &block)
           association_klass = association.klass
           name              = association.name.to_s
-          return if fields[name]
+          return if field_exists?(name)
 
           klass = model_klass
           type  = Types[association_klass]
@@ -95,11 +95,15 @@ module HQ
 
         def field_from_column(column, auto_nil:)
           name = column.name
-          return if fields[name]
+          return if field_exists?(name)
 
           field name, Types.type_from_column(column), null: !auto_nil || column.null
         end
 
+        def field_exists?(name)
+          !!fields[camelize(name)]
+        end
+
         def association_required?(association)
           !association.options[:optional] || has_presence_validation?(association)
         end

data/lib/hq/graphql/version.rb

@@ -2,6 +2,6 @@
 
 module HQ
   module GraphQL
-    VERSION = "2.1.9"
+    VERSION = "2.1.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hq-graphql
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Danny Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails