Skip to content

Commit adc8191

Browse files
committed
MC-14884: MySQL Upgrade - v8
1 parent 039992f commit adc8191

File tree

1 file changed

+7
-8
lines changed
  • lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns

1 file changed

+7
-8
lines changed

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,16 @@ public function fromDefinition(array $data)
106106
{
107107
$matches = [];
108108
if (preg_match(
109-
'/^(?<type>big|small|tiny|medium)?int(\((?<padding>\d+)\))*/',
109+
'/^(?<type>(?:big|small|tiny|medium)?int)(?:\((?<padding>\d+)\))?/',
110110
$data['definition'],
111111
$matches
112112
)) {
113-
/**
114-
* match[1] - prefix
115-
* match[2] - padding with beaked, like (5) or (11)
116-
* match[3] - padding, like 5 or 11
117-
*/
118-
if (count($matches) >= 4) {
119-
//Use shortcut for mediuminteger
113+
$data['padding'] = null;
114+
// we have an agreement that tinyint(1) is Boolean
115+
if (isset($matches['padding'])
116+
&& $matches['type'] === 'tinyint'
117+
&& $matches['padding'] === '1'
118+
) {
120119
$data['padding'] = $matches['padding'];
121120
}
122121
$data = $this->unsigned->fromDefinition($data);

0 commit comments

Comments
 (0)