MAGETWO-85326: Tool for generating schema

--make magento works with new schema
magento · Jan 3, 2018 · 86fb388 · 86fb388
1 parent 732bb68
commit 86fb388
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 29 deletions.
diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml
@@ -1374,37 +1374,37 @@
         <column xsi:type="smallint" name="store_id" padding="6" unsigned="true" nullable="true" identity="false"/>
         <column xsi:type="varchar" name="order_status" nullable="false" length="50"/>
         <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
-                default="'0'"/>
+                default="0"/>
         <column xsi:type="decimal" name="total_qty_ordered" scale="12" precission="4" unsigned="false" nullable="false"
-                default="'0.0000'"/>
+                default="0.0000"/>
         <column xsi:type="decimal" name="total_qty_invoiced" scale="12" precission="4" unsigned="false" nullable="false"
-                default="'0.0000'"/>
+                default="0.0000"/>
         <column xsi:type="decimal" name="total_income_amount" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_revenue_amount" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_profit_amount" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_invoiced_amount" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_canceled_amount" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_paid_amount" scale="12" precission="4" unsigned="false" nullable="false"
-                default="'0.0000'"/>
+                default="0.0000"/>
         <column xsi:type="decimal" name="total_refunded_amount" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_tax_amount" scale="12" precission="4" unsigned="false" nullable="false"
-                default="'0.0000'"/>
+                default="0.0000"/>
         <column xsi:type="decimal" name="total_tax_amount_actual" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_shipping_amount" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_shipping_amount_actual" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_discount_amount" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_discount_amount_actual" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="id"/>
         </constraint>

diff --git a/app/code/Magento/SalesRule/etc/db_schema.xml b/app/code/Magento/SalesRule/etc/db_schema.xml
@@ -221,19 +221,19 @@
         <column xsi:type="varchar" name="order_status" nullable="true" length="50"/>
         <column xsi:type="varchar" name="coupon_code" nullable="true" length="50"/>
         <column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
-                default="'0'"/>
+                default="0"/>
         <column xsi:type="decimal" name="subtotal_amount" scale="12" precission="4" unsigned="false" nullable="false"
-                default="'0.0000'"/>
+                default="0.0000"/>
         <column xsi:type="decimal" name="discount_amount" scale="12" precission="4" unsigned="false" nullable="false"
-                default="'0.0000'"/>
+                default="0.0000"/>
         <column xsi:type="decimal" name="total_amount" scale="12" precission="4" unsigned="false" nullable="false"
-                default="'0.0000'"/>
+                default="0.0000"/>
         <column xsi:type="decimal" name="subtotal_amount_actual" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="discount_amount_actual" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="decimal" name="total_amount_actual" scale="12" precission="4" unsigned="false"
-                nullable="false" default="'0.0000'"/>
+                nullable="false" default="0.0000"/>
         <column xsi:type="varchar" name="rule_name" nullable="true" length="255"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="id"/>

diff --git a/app/code/Magento/Tax/etc/db_schema.xml b/app/code/Magento/Tax/etc/db_schema.xml
@@ -158,7 +158,7 @@
         <column xsi:type="varchar" name="order_status" nullable="false" length="50"/>
         <column xsi:type="float" name="percent" scale="10" precission="0" unsigned="false" nullable="true"/>
         <column xsi:type="int" name="orders_count" padding="11" unsigned="true" nullable="false" identity="false"
-                default="'0'"/>
+                default="0"/>
         <column xsi:type="float" name="tax_base_amount_sum" scale="10" precission="0" unsigned="false" nullable="true"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="id"/>

diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/boolean.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/boolean.xsd
@@ -11,5 +11,6 @@
     <xs:complexType name="boolean">
         <xs:attributeGroup ref="baseColumn" />
         <xs:attribute name="default" type="xs:boolean" />
+        <xs:attribute name="nullable" type="xs:boolean" />
     </xs:complexType>
 </xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
@@ -874,7 +874,7 @@ private function handleDBSchemaData($setup, $type)
         $upgradeType = $type . '-upgrade';
         $moduleNames = $this->moduleList->getNames();
         $moduleContextList = $this->generateListOfModuleContext($resource, $verType);
-        if ($type !== 'schema') {
+        #if ($type !== 'schema') {
             foreach ($moduleNames as $moduleName) {
                 $this->schemaListener->setModuleName($moduleName);
                 $this->log->log("Module '{$moduleName}':");
@@ -914,10 +914,10 @@ private function handleDBSchemaData($setup, $type)
                 }
                 $this->logProgress();
             }
-        }
+        #}
 
         //Before recurring generate schema
-        //$this->schemaPersistor->persist($this->schemaListener);
+        $this->schemaPersistor->persist($this->schemaListener);
         if ($type === 'schema') {
             $this->log->log('Schema post-updates:');
             $handlerType = 'schema-recurring';

diff --git a/setup/src/Magento/Setup/Model/SchemaListenerDefinition/DecimalDefinition.php b/setup/src/Magento/Setup/Model/SchemaListenerDefinition/DecimalDefinition.php
@@ -34,7 +34,7 @@ public function convertToDefinition(array $definition)
             'precission' => $definition['scale'] ?? self::DEFAULT_SCALE,
             'unsigned' => $definition['unsigned'] ?? false,
             'nullable' => $definition['nullable'] ?? true,
-            'default' => $definition['default'] ?? null,
+            'default' => isset($definition['default']) ? (int) $definition['default'] : null,
             'primary' => $definition['primary'] ?? false
         ];
     }

diff --git a/setup/src/Magento/Setup/Model/SchemaListenerDefinition/IntegerDefinition.php b/setup/src/Magento/Setup/Model/SchemaListenerDefinition/IntegerDefinition.php
@@ -23,6 +23,20 @@ class IntegerDefinition implements DefinitionConverterInterface
         'bigint' => 20
     ];
 
+    /**
+     * @var BooleanDefinition
+     */
+    private $booleanDefinition;
+
+    /**
+     * IntegerDefinition constructor.
+     * @param BooleanDefinition $booleanDefinition
+     */
+    public function __construct(BooleanDefinition $booleanDefinition)
+    {
+        $this->booleanDefinition = $booleanDefinition;
+    }
+
     /**
      * @inheritdoc
      */
@@ -32,14 +46,19 @@ public function convertToDefinition(array $definition)
             $definition['type'] = 'int';
         }
 
+        if (isset($definition['padding']) && $definition['padding'] == 1) {
+            $definition['type'] = 'boolean';
+            return $this->booleanDefinition->convertToDefinition($definition);
+        }
+
         return [
             'xsi:type' => $definition['type'],
             'name' => $definition['name'],
             'padding' => $definition['length'] ?? self::$lengthDefaults[$definition['type']],
             'unsigned' => $definition['unsigned'] ?? false,
             'nullable' => $definition['nullable'] ?? true,
             'identity' => $definition['identity'] ?? false,
-            'default' => $definition['default'] ?? null,
+            'default' => isset($definition['default']) ? (int) $definition['default'] : null,
             'primary' => $definition['primary'] ?? false
         ];
     }