Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

This commit is contained in:
yuri
2018-11-30 14:28:24 +02:00
2 changed files with 3 additions and 4 deletions
@@ -408,6 +408,7 @@ class Converter
if ($fieldParams['type'] != 'id' && isset($fieldParams['autoincrement']) && $fieldParams['autoincrement']) {
$dbFieldParams['unique'] = true;
$dbFieldParams['notnull'] = true;
$dbFieldParams['unsigned'] = true;
}
if (isset($fieldParams['utf8mb3']) && $fieldParams['utf8mb3']) {
@@ -70,9 +70,7 @@ class Helper
$fieldDef = array('type' => $fieldDef);
}
if (isset($fieldDef['dbType'])) {
return $this->getMetadata()->get('fields.'.$fieldDef['dbType']);
} else if (isset($fieldDef['type'])) {
if (isset($fieldDef['type'])) {
return $this->getMetadata()->get('fields.'.$fieldDef['type']);
}
@@ -161,4 +159,4 @@ class Helper
}
}
}