From ba623fe3f0772e13a328e8929624868e3fe4bf57 Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@espocrm.com>
Date: Fri, 30 Nov 2018 14:20:15 +0200
Subject: [PATCH] Metadata bug fixes

---
 application/Espo/Core/Utils/Database/Schema/Converter.php | 1 +
 application/Espo/Core/Utils/Metadata/Helper.php           | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/application/Espo/Core/Utils/Database/Schema/Converter.php b/application/Espo/Core/Utils/Database/Schema/Converter.php
index 7ad0ce436b..bc1a41d75b 100644
--- a/application/Espo/Core/Utils/Database/Schema/Converter.php
+++ b/application/Espo/Core/Utils/Database/Schema/Converter.php
@@ -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']) {
diff --git a/application/Espo/Core/Utils/Metadata/Helper.php b/application/Espo/Core/Utils/Metadata/Helper.php
index 431bada5d9..85d6c85238 100644
--- a/application/Espo/Core/Utils/Metadata/Helper.php
+++ b/application/Espo/Core/Utils/Metadata/Helper.php
@@ -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
 
     }
 
-}
\ No newline at end of file
+}