Merge pull request #449 from magento-firedrakes/MAGETWO-40015

[Firedrakes] Remove Schema & Data Upgrades
magento · Jul 12, 2015 · 5e8b706 · 5e8b706
2 parents 2382298 + 7f36f6a
commit 5e8b706
Show file tree

Hide file tree

Showing 44 changed files with 375 additions and 1,416 deletions.
diff --git a/app/code/Magento/Backend/etc/module.xml b/app/code/Magento/Backend/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_Backend" setup_version="2.0.0.0">
+    <module name="Magento_Backend" setup_version="2.0.0">
         <sequence>
             <module name="Magento_Directory"/>
         </sequence>

diff --git a/app/code/Magento/Backup/etc/module.xml b/app/code/Magento/Backup/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_Backup" setup_version="1.6.0.0">
+    <module name="Magento_Backup" setup_version="2.0.0">
         <sequence>
             <module name="Magento_Store"/>
         </sequence>

diff --git a/app/code/Magento/Catalog/Setup/InstallData.php b/app/code/Magento/Catalog/Setup/InstallData.php
@@ -301,5 +301,17 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
                 '1'
             );
         }
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'custom_design_from',
+            'attribute_model',
+            'Magento\Catalog\Model\Resource\Eav\Attribute'
+        );
+        $categorySetup->updateAttribute(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'custom_design_from',
+            'frontend_model',
+            'Magento\Eav\Model\Entity\Attribute\Frontend\Datetime'
+        );
     }
 }
diff --git a/app/code/Magento/Catalog/Setup/InstallSchema.php b/app/code/Magento/Catalog/Setup/InstallSchema.php
@@ -37,13 +37,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
                 'Entity ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_set_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -93,10 +86,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 [],
                 'Update Time'
             )
-            ->addIndex(
-                $installer->getIdxName('catalog_product_entity', ['entity_type_id']),
-                ['entity_type_id']
-            )
             ->addIndex(
                 $installer->getIdxName('catalog_product_entity', ['attribute_set_id']),
                 ['attribute_set_id']
@@ -117,13 +106,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'attribute_set_id',
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
-            ->addForeignKey(
-                $installer->getFkName('catalog_product_entity', 'entity_type_id', 'eav_entity_type', 'entity_type_id'),
-                'entity_type_id',
-                $installer->getTable('eav_entity_type'),
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
             ->setComment('Catalog Product Table');
         $installer->getConnection()->createTable($table);
 
@@ -139,13 +121,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -237,13 +212,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -335,13 +303,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -423,13 +384,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -521,13 +475,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -619,13 +566,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -664,10 +604,10 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             ->addIndex(
                 $installer->getIdxName(
                     'catalog_product_entity_gallery',
-                    ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                    ['entity_id', 'attribute_id', 'store_id'],
                     \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
                 ),
-                ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                ['entity_id', 'attribute_id', 'store_id'],
                 ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
             )
             ->addIndex(
@@ -728,13 +668,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
                 'Entity ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_set_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -810,13 +743,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -848,10 +774,10 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             ->addIndex(
                 $installer->getIdxName(
                     'catalog_category_entity_datetime',
-                    ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                    ['entity_id', 'attribute_id', 'store_id'],
                     \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
                 ),
-                ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                ['entity_id', 'attribute_id', 'store_id'],
                 ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
             )
             ->addIndex(
@@ -912,13 +838,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -950,10 +869,10 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             ->addIndex(
                 $installer->getIdxName(
                     'catalog_category_entity_decimal',
-                    ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                    [ 'entity_id', 'attribute_id', 'store_id'],
                     \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
                 ),
-                ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                ['entity_id', 'attribute_id', 'store_id'],
                 ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
             )
             ->addIndex(
@@ -1014,13 +933,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -1052,10 +964,10 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             ->addIndex(
                 $installer->getIdxName(
                     'catalog_category_entity_int',
-                    ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                    ['entity_id', 'attribute_id', 'store_id'],
                     \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
                 ),
-                ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                ['entity_id', 'attribute_id', 'store_id'],
                 ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
             )
             ->addIndex(
@@ -1111,13 +1023,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -1149,10 +1054,10 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             ->addIndex(
                 $installer->getIdxName(
                     'catalog_category_entity_text',
-                    ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                    ['entity_id', 'attribute_id', 'store_id'],
                     \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
                 ),
-                ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                ['entity_id', 'attribute_id', 'store_id'],
                 ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
             )
             ->addIndex(
@@ -1208,13 +1113,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['identity' => true, 'nullable' => false, 'primary' => true],
                 'Value ID'
             )
-            ->addColumn(
-                'entity_type_id',
-                \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-                null,
-                ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Entity Type ID'
-            )
             ->addColumn(
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -1246,10 +1144,10 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             ->addIndex(
                 $installer->getIdxName(
                     'catalog_category_entity_varchar',
-                    ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                    ['entity_id', 'attribute_id', 'store_id'],
                     \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
                 ),
-                ['entity_type_id', 'entity_id', 'attribute_id', 'store_id'],
+                ['entity_id', 'attribute_id', 'store_id'],
                 ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
             )
             ->addIndex(
@@ -4659,7 +4557,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             );
         $installer->getConnection()
             ->createTable($table);
-
         $installer->endSetup();
 
     }

diff --git a/app/code/Magento/Catalog/Setup/UpgradeData.php b/app/code/Magento/Catalog/Setup/UpgradeData.php