Merge pull request #13 from thecodingmachine/fix_json_columns

Fixing handling of JSON columns (they are now ignored)

Author: moufmouf

.travis.yml

@@ -4,6 +4,20 @@ php:
 cache:
   directories:
     - $HOME/.composer/cache
+
+services:
+  - mysql
+
+addons:
+  apt:
+    sources:
+      - mysql-5.7-trusty
+    packages:
+      - mysql-server
+
+dist: trusty
+sudo: required
+
 env:
   matrix:
   - PREFER_LOWEST="--prefer-lowest"

src/AbstractTdbmGraphQLTypeMapper.php

@@ -99,7 +99,7 @@ private function mapTypeToInputType(TypeInterface $type): InputTypeInterface
 
         $this->typeToInputTypes->attach($type, $inputType);
 
-        $inputFields = array_map(function(\Youshido\GraphQL\Field\FieldInterface $field) {
+        $inputFields = array_map(function (\Youshido\GraphQL\Field\FieldInterface $field) {
             $type = $field->getType();
             /*if ($type instanceof NonNullType) {
                 return new NonNullType($this->mapTypeToInputType($type->getNullableType()));

src/GraphQLTypeGenerator.php

@@ -86,6 +86,9 @@ private function generateAbstractTypeFile(BeanDescriptorInterface $beanDescripto
         $typeName = var_export($this->namingStrategy->getGraphQLType($beanDescriptor->getBeanClassName()), true);
 
         $properties = $beanDescriptor->getExposedProperties();
+
+        $properties = array_filter($properties, [$this, 'canBeCastToGraphQL']);
+
         $fieldsCodes = array_map([$this, 'generateFieldCode'], $properties);
 
         $fieldsCode = implode('', $fieldsCodes);
@@ -243,6 +246,21 @@ public function alter(): void
         $fileSystem->dumpFile($filePaths[0], $str);
     }
 
+    /**
+     * Some fields cannot be bound to GraphQL fields (for instance JSON fields)
+     */
+    private function canBeCastToGraphQL(AbstractBeanPropertyDescriptor $descriptor) : bool
+    {
+        if ($descriptor instanceof ScalarBeanPropertyDescriptor) {
+            $phpType = $descriptor->getPhpType();
+            if ($phpType === 'array') {
+                // JSON type cannot be casted since GraphQL does not allow for untyped arrays.
+                return false;
+            }
+        }
+        return true;
+    }
+
     private function generateFieldCode(AbstractBeanPropertyDescriptor $descriptor) : string
     {
         $getterName = $descriptor->getGetterName();

tests/sql/graphqlunittest.sql

@@ -158,7 +158,8 @@ CREATE TABLE IF NOT EXISTS `users` (
   `login` varchar(255) NOT NULL,
   `password` varchar(255) DEFAULT NULL,
   `status` varchar(10) DEFAULT NULL,
-  `country_id` int(11) NOT NULL
+  `country_id` int(11) NOT NULL,
+  `additional_data` JSON NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------