Merge branch '1.9' into 1

open-sausages · Sep 7, 2021 · 3628e23 · 3628e23
2 parents 602742e + 445b148
commit 3628e23
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/GraphQL/Plugins/VersionedDataObject.php b/src/GraphQL/Plugins/VersionedDataObject.php
@@ -4,8 +4,10 @@
 
 use SilverStripe\Core\Extensible;
 use SilverStripe\GraphQL\Schema\DataObject\Plugin\Paginator;
+use SilverStripe\GraphQL\Schema\DataObject\Plugin\ScalarDBField;
 use SilverStripe\GraphQL\Schema\Exception\SchemaBuilderException;
 use SilverStripe\GraphQL\Schema\Field\Field;
+use SilverStripe\GraphQL\Schema\Field\ModelField;
 use SilverStripe\GraphQL\Schema\Interfaces\ModelTypePlugin;
 use SilverStripe\GraphQL\Schema\Interfaces\SchemaUpdater;
 use SilverStripe\GraphQL\Schema\Plugin\AbstractQuerySortPlugin;
@@ -90,7 +92,9 @@ public function apply(ModelType $type, Schema $schema, array $config = []): void
         $memberTypeName = $memberType->getModel()->getTypeName();
         $resolver = ['resolver' => [VersionedResolver::class, 'resolveVersionFields']];
 
-        $type->addField('version', 'Int');
+        $type->addField('version', 'Int', function (ModelField $field) {
+            $field->addResolverAfterware([ScalarDBField::class, 'resolve']);
+        });
 
         $versionType = Type::create($versionName)
             ->addField('author', ['type' => $memberTypeName] + $resolver)