improve adding/updating collection fields

Fixes #208 It prevents the update from removing the comment and auto_increment. There is no way to set the encoding and collation through Zend Db. Updating a column will remove it and set it to the table default
directus · Jun 21, 2018 · b11fbb5 · b11fbb5
1 parent 92a0e69
commit b11fbb5
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 15 deletions.
diff --git a/src/core/Directus/Database/Schema/Object/Field.php b/src/core/Directus/Database/Schema/Object/Field.php
@@ -204,7 +204,7 @@ public function getExtra()
      */
     public function hasAutoIncrement()
     {
-        return strtolower($this->getExtra() ?: '') === 'auto_increment';
+        return (bool) $this->attributes->get('auto_increment', false);
     }
 
     /**
@@ -214,7 +214,7 @@ public function hasAutoIncrement()
      */
     public function hasPrimaryKey()
     {
-        return strtoupper($this->getKey()) === 'PRI';
+        return (bool) $this->attributes->get('primary_key', false);
     }
 
     /**
@@ -224,7 +224,7 @@ public function hasPrimaryKey()
      */
     public function hasUniqueKey()
     {
-        return strtoupper($this->getKey()) === 'UNI';
+        return (bool) $this->attributes->get('unique', false);
     }
 
     /**

diff --git a/src/core/Directus/Database/Schema/SchemaFactory.php b/src/core/Directus/Database/Schema/SchemaFactory.php
@@ -111,15 +111,19 @@ public function alterTable($name, array $data)
     {
         $table = new AlterTable($name);
 
-        $collection = $this->schemaManager->getCollection($name);
-
         $toAddColumnsData = ArrayUtils::get($data, 'add', []);
         $toAddColumns = $this->createColumns($toAddColumnsData);
         foreach ($toAddColumns as $column) {
             $table->addColumn($column);
 
             $options = $column->getOptions();
-            if (is_array($options) && ArrayUtils::get($options, 'unique') == true) {
+            if (!is_array($options)) {
+                continue;
+            }
+
+            if (ArrayUtils::get($options, 'primary_key') == true) {
+                $table->addConstraint(new PrimaryKey($column->getName()));
+            } if (ArrayUtils::get($options, 'unique') == true) {
                 $table->addConstraint(new UniqueKey($column->getName()));
             }
         }
@@ -129,13 +133,14 @@ public function alterTable($name, array $data)
         foreach ($toChangeColumns as $column) {
             $table->changeColumn($column->getName(), $column);
 
-            $field = $collection->getField($column->getName());
-            if ($field->hasUniqueKey()) {
-                throw new FieldAlreadyHasUniqueKeyException($column->getName());
+            $options = $column->getOptions();
+            if (!is_array($options)) {
+                continue;
             }
 
-            $options = $column->getOptions();
-            if (is_array($options) && ArrayUtils::get($options, 'unique') == true) {
+            if (ArrayUtils::get($options, 'primary_key') == true) {
+                $table->addConstraint(new PrimaryKey($column->getName()));
+            } if (ArrayUtils::get($options, 'unique') == true) {
                 $table->addConstraint(new UniqueKey($column->getName()));
             }
         }
@@ -182,13 +187,13 @@ public function createColumn($name, array $data)
         $nullable = ArrayUtils::get($data, 'nullable', true);
         $default = ArrayUtils::get($data, 'default_value', null);
         $unsigned = ArrayUtils::get($data, 'unsigned', false);
-        // TODO: Make comment work in an abstract level
-        // ZendDB doesn't support charset nor comment
-        // $comment = ArrayUtils::get($data, 'comment');
+        $note = ArrayUtils::get($data, 'note');
+        // ZendDB doesn't support encoding nor collation
 
         $column = $this->createColumnFromType($name, $type);
         $column->setNullable($nullable);
         $column->setDefault($default);
+        $column->setOption('comment', $note);
 
         if (!$autoincrement && $unique === true) {
             $column->setOption('unique', $unique);

diff --git a/src/core/Directus/Database/Schema/Sources/MySQLSchema.php b/src/core/Directus/Database/Schema/Sources/MySQLSchema.php
@@ -156,6 +156,9 @@ public function getAllFields(array $params = [])
             'sort' => new Expression('IFNULL(DF.sort, SF.ORDINAL_POSITION)'),
             'original_type' => new Expression('UCASE(SF.DATA_TYPE)'),
             'key' => 'COLUMN_KEY',
+            'unique' => new Expression('IF(SF.COLUMN_KEY="UNI",1,0)'),
+            'primary_key' => new Expression('IF(SF.COLUMN_KEY="PRI",1,0)'),
+            'auto_increment' => new Expression('IF(SF.EXTRA="auto_increment",1,0)'),
             'extra' => 'EXTRA',
             'char_length' => 'CHARACTER_MAXIMUM_LENGTH',
             'precision' => 'NUMERIC_PRECISION',
@@ -207,6 +210,9 @@ public function getAllFields(array $params = [])
             'sort',
             'original_type' => new Expression('NULL'),
             'key' => new Expression('NULL'),
+            'unique' => new Expression('NULL'),
+            'primary_key' => new Expression('NULL'),
+            'auto_increment' => new Expression('NULL'),
             'extra' => new Expression('NULL'),
             'char_length' => new Expression('NULL'),
             'precision' => new Expression('NULL'),

diff --git a/src/core/Directus/Services/TablesService.php b/src/core/Directus/Services/TablesService.php
@@ -1281,7 +1281,13 @@ protected function mergeSchemaField(Field $field, array $fieldData = [])
      */
     protected function unknownFieldsAllowed()
     {
-        return ['default_value'];
+        return [
+            'default_value',
+            'auto_increment',
+            'primary_key',
+            'unique',
+            'unsigned'
+        ];
     }
 
     /**