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

application/Espo/Core/Utils/Database/Orm/Converter.php

@@ -151,6 +151,10 @@ class Converter
             ),
         );
 
+        if (isset($entityMeta['indexes'])) {
+            $ormMeta[$entityName]['indexes'] = $entityMeta['indexes'];
+        }
+
         $ormMeta[$entityName]['fields'] = $this->convertFields($entityName, $entityMeta);
 
         $convertedLinks = $this->convertLinks($entityName, $entityMeta, $ormMeta);

application/Espo/Core/Utils/Database/Schema/Converter.php

@@ -162,9 +162,15 @@ class Converter
             }
 
             $tables[$entityName]->setPrimaryKey($primaryColumns);
+
+            //add indexes
+            if (isset($entityParams['indexes']) && is_array($entityParams['indexes'])) {
+                $indexList = array_merge($indexList, $entityParams['indexes']);
+            }
             if (!empty($indexList)) {
-                foreach($indexList as $indexItem) {
-                    $tables[$entityName]->addIndex($indexItem);
+                foreach($indexList as $indexName => $indexItem) {
+                    $tableIndexName = is_string($indexName) ? $indexName : null;
+                    $tables[$entityName]->addIndex($indexItem, $tableIndexName);
                 }
             }
 

application/Espo/Core/Utils/Database/Schema/Schema.php

@@ -198,7 +198,7 @@ class Schema
         $result = true;
         $connection = $this->getConnection();
         foreach ($queries as $sql) {
-            $GLOBALS['log']->debug('SCHEMA, Execute Query: '.$sql);
+            $GLOBALS['log']->info('SCHEMA, Execute Query: '.$sql);
             try {
                 $result &= (bool) $connection->executeQuery($sql);
             } catch (\Exception $e) {

application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json

@@ -162,5 +162,8 @@
     "collection": {
         "sortBy": "name",
         "asc": true
+    },
+    "indexes": {
+        "name": ["name"]
     }
 }