espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yuri
2019-10-01 10:16:48 +03:00
parent bf5fe492b3 87036f83e1
commit 2df476d734
1 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Utils/Database/Schema/Converter.php
+33 -14
View File
@@ -238,20 +238,7 @@ class Converter
$tables[$entityName]->setPrimaryKey($primaryColumns);
if (!empty($indexList[$entityName])) {
foreach($indexList[$entityName] as $indexName => $indexParams) {
switch ($indexParams['type']) {
case 'index':
case 'fulltext':
$indexFlagList = isset($indexParams['flags']) ? $indexParams['flags'] : array();
$tables[$entityName]->addIndex($indexParams['columns'], $indexName, $indexFlagList);
break;
case 'unique':
$tables[$entityName]->addUniqueIndex($indexParams['columns'], $indexName);
break;
}
}
$this->addIndexes($tables[$entityName], $indexList[$entityName]);
}
}
@@ -338,6 +325,19 @@ class Converter
}
} //END: add additionalColumns
//add defined indexes
if (!empty($relationParams['indexes'])) {
$normalizedIndexes = SchemaUtils::getIndexList([
$entityName => [
'fields' => [],
'indexes' => $relationParams['indexes'],
]
]);
$this->addIndexes($table, $normalizedIndexes[$entityName]);
}
//END: add defined indexes
//add unique indexes
if (!empty($relationParams['conditions'])) {
foreach ($relationParams['conditions'] as $fieldName => $fieldParams) {
@@ -360,6 +360,25 @@ class Converter
return $table;
}
protected function addIndexes($table, array $indexes)
{
foreach($indexes as $indexName => $indexParams) {
$indexType = !empty($indexParams['type']) ? $indexParams['type'] : SchemaUtils::getIndexTypeByIndexDefs($indexParams);
switch ($indexType) {
case 'index':
case 'fulltext':
$indexFlagList = isset($indexParams['flags']) ? $indexParams['flags'] : array();
$table->addIndex($indexParams['columns'], $indexName, $indexFlagList);
break;
case 'unique':
$table->addUniqueIndex($indexParams['columns'], $indexName);
break;
}
}
}
protected function getDbFieldParams($fieldParams)
{
$dbFieldParams = array();