graphql-activerecord 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e9f35aa548f10556deb6481be1861a221b07c55
-  data.tar.gz: f98efc92a044fc51a2ed003b9f591870786373e6
+  metadata.gz: 2b316be308228bed3428c853f1758487bfc539c0
+  data.tar.gz: 80ac3b3c800a9917cd5c3cd372f210d28c04bedc
 SHA512:
-  metadata.gz: 4b9a15fec449730050cb307f886a3c14c3d862d65caed881d385d7708a861e4272a957efa3a7905fce02d64da450489f59b03343d08710b36daaee05f9bed06f
-  data.tar.gz: b72ed02d3c119472a37a6e7f4fd27ea2499472a843460522d53d9f33a28348098e3e109f2fbb5c0e4c5b37957aaa0e30b105a7752fcc49b875bbe1ac18054bf9
+  metadata.gz: e455b6ea181c3e193c9dbd338a16e010b3022c240e0ec16dda062dc6f8e98ba4cd242843a9e67a5a35cc0c7a5e58b79880c1496e1b5c0c41c1589ba1e5b12ebf
+  data.tar.gz: 27c16e7e09fb531eb9bbf121485a822cb3335142ebc495d6a9637a0784da3588857ded4eabfc6f1fe66359386964dbbeea64a949d1cead293fa688325eaa670d

data/lib/graphql/activerecord.rb

@@ -63,9 +63,12 @@ module GraphQL
     end
 
     def self.define_mutator(definer, model_type, null_behavior:, &block)
+      # HACK: To get the name of the mutation, to avoid possible collisions with other type names
+      prefix = definer.instance_variable_get(:@target).name
+
       mutator_definition = MutatorDefinition.new(model_type, null_behavior: null_behavior)
       mutator_definition.field_map.instance_exec(&block)
-      MutationHelpers.print_input_fields(mutator_definition.field_map, definer, model_type.name)
+      MutationHelpers.print_input_fields(mutator_definition.field_map, definer, "#{prefix}Input")
       mutator_definition
     end
   end

data/lib/graphql/models/mutation_helpers/print_input_fields.rb

@@ -13,15 +13,18 @@ module GraphQL::Models
         end
 
         if field_map.leave_null_unchanged?
-          field_names = field_map.fields.map { |f| f[:name] } + field_map.nested_maps.map { |m| m.name }
+          field_names = field_map.fields.select { |f| !f[:required] }.map { |f| f[:name] }
+          field_names += field_map.nested_maps.reject(&:required).map { |m| m.name }
           field_names = field_names.sort_by { |s| s }
 
-          enum = GraphQL::EnumType.define do
-            name "#{map_name_prefix}UnsettableFields"
-            field_names.each { |n| value(n, n.titleize, value: n) }
-          end
+          unless field_names.empty?
+            enum = GraphQL::EnumType.define do
+              name "#{map_name_prefix}UnsettableFields"
+              field_names.each { |n| value(n, n.titleize, value: n) }
+            end
 
-          input_field('unsetFields', types[!enum])
+            input_field('unsetFields', types[!enum])
+          end
         end
       end
 

data/lib/graphql/models/mutator.rb

@@ -32,8 +32,8 @@ module GraphQL::Models
 
     def save!
       fail StandardError.new("Need to call apply_changes before #{__method__}") unless @all_changes
-      
-      ActiveRecord::Base.transaction do
+
+      ActiveRecord::Base.transaction(requires_new: true) do
         changed_models.each do |model|
           next if model.destroyed?
 

data/lib/graphql/models/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Models
-    VERSION = "0.6.3"
+    VERSION = "0.6.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Ryan Foster