Skip to content

Commit

Permalink
SW-17922 - Fix last issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@htkassner @OliverSkroblin
htkassner authored and OliverSkroblin committed Apr 19, 2018
1 parent 15bc087 commit 2bb793a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 49 deletions.
41 changes: 0 additions & 41 deletions _sql/destructive.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ ALTER TABLE payment_method_attribute
DROP FOREIGN KEY `payment_method_attribute_ibfk_1`
;

ALTER TABLE payment_method_shop
DROP FOREIGN KEY `payment_method_shop_ibfk_1`
;

ALTER TABLE product_attachment_attribute
DROP FOREIGN KEY `product_attachment_attribute_ibfk_1`
;
Expand Down Expand Up @@ -477,12 +473,6 @@ ALTER TABLE product_category
;

ALTER TABLE product_category_ro
DROP INDEX `articleID`,
DROP INDEX `articleID_2`,
DROP INDEX `categoryID`,
DROP INDEX `categoryID_2`,
DROP INDEX `category_id_by_article_id`,
DROP INDEX `elastic_search`,
DROP `id`,
DROP `category_id`,
DROP `parent_category_id`,
Expand Down Expand Up @@ -517,10 +507,6 @@ ALTER TABLE product_detail
DROP `order_number`
;

ALTER TABLE product_attribute
DROP COLUMN articleID
;

ALTER TABLE product_esd
DROP `id`,
DROP `product_id`,
Expand Down Expand Up @@ -598,21 +584,6 @@ ALTER TABLE product_price_attribute
DROP `price_id`
;

ALTER TABLE `product_category_ro`
DROP INDEX articleID,
DROP INDEX articleID_2,
DROP INDEX categoryID,
DROP INDEX categoryID_2,
DROP INDEX category_id_by_article_id,
DROP INDEX elastic_search,
DROP COLUMN id,
DROP COLUMN category_id,
DROP COLUMN parent_category_id,
DROP COLUMN product_id,
DROP COLUMN uuid,
ADD PRIMARY KEY (product_uuid, category_uuid, parent_category_uuid)
;

ALTER TABLE product_similar
DROP `id`,
DROP `product_id`,
Expand Down Expand Up @@ -670,15 +641,8 @@ ALTER TABLE seo_url
DROP `id`
;


DROP TABLE IF EXISTS `s_core_sessions`;

ALTER TABLE media
DROP `extension`,
DROP `width`,
DROP `height`
;

ALTER TABLE `snippet` DROP INDEX `namespace`;
ALTER TABLE `snippet` DROP locale_id;

Expand All @@ -687,8 +651,3 @@ DROP TABLE s_media_album_settings;

ALTER TABLE `product_stream` DROP `sorting`;

DELETE FROM plugin WHERE namespace != 'ShopwarePlugins';

ALTER TABLE `plugin`
DROP `namespace`,
DROP `source`;
16 changes: 8 additions & 8 deletions _sql/fixup.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,7 @@ UPDATE product_category_seo pcs SET


UPDATE product_detail pd SET
pd.uuid = CONCAT('SWAG-PRODUCT-DETAIL-UUID-', pd.id),
pd.uuid = pd.order_number,
pd.product_uuid = CONCAT('SWAG-PRODUCT-UUID-', pd.product_id)
;
UPDATE product_detail SET unit_uuid = CONCAT('SWAG-UNIT-UUID-', unit_id) WHERE unit_id IS NOT NULL;
Expand Down Expand Up @@ -1714,7 +1714,7 @@ UPDATE shop SET category_uuid = CONCAT('SWAG-CATEGORY-UUID-', category_id) WHER
UPDATE shop SET locale_uuid = CONCAT('SWAG-LOCALE-UUID-', locale_id) WHERE locale_id IS NOT NULL;
UPDATE shop SET currency_uuid = CONCAT('SWAG-CURRENCY-UUID-', currency_id) WHERE currency_id IS NOT NULL;
UPDATE shop SET customer_group_uuid = CONCAT('SWAG-CUSTOMER-GROUP-UUID-', customer_group_id) WHERE customer_group_id IS NOT NULL;
UPDATE shop SET fallback_locale_uuid = CONCAT('SWAG-FALLBACK-LOCALE-UUID-', fallback_id) WHERE fallback_id IS NOT NULL;
UPDATE shop SET fallback_locale_uuid = CONCAT('SWAG-LOCALE-UUID-', fallback_id) WHERE fallback_id IS NOT NULL;
UPDATE shop SET payment_method_uuid = CONCAT('SWAG-PAYMENT-METHOD-UUID-', payment_method_id) WHERE payment_method_id IS NOT NULL;
UPDATE shop SET shipping_method_uuid = CONCAT('SWAG-SHIPPING-METHOD-UUID-', shipping_method_id) WHERE shipping_method_id IS NOT NULL;
UPDATE shop SET area_country_uuid = CONCAT('SWAG-AREA-COUNTRY-UUID-', area_country_id) WHERE area_country_id IS NOT NULL;
Expand Down Expand Up @@ -1744,7 +1744,7 @@ UPDATE category SET product_stream_uuid = CONCAT('SWAG-PRODUCT-STREAM-UUID-', pr
UPDATE category SET media_uuid = CONCAT('SWAG-MEDIA-UUID-', media_id) WHERE media_id IS NOT NULL AND media_id > 0;
UPDATE product_configurator_group SET uuid = CONCAT('SWAG-PRODUCT-CONFIGURATOR-GROUP-UUID-', id) WHERE id IS NOT NULL;
UPDATE product_configurator_option SET uuid = CONCAT('SWAG-PRODUCT-CONFIGURATOR-OPTION-UUID-', id) WHERE id IS NOT NULL;
UPDATE product_configurator_option SET product_configurator_group_uuid = CONCAT('SWAG-PRODUCT-CONFIGURATOR-GROUP-UUID-', group_id) WHERE id IS NOT NULL;
UPDATE product_configurator_option SET product_configurator_group_uuid = CONCAT('SWAG-PRODUCT-CONFIGURATOR-GROUP-UUID-', group_id) WHERE group_id IS NOT NULL;
UPDATE product_stream SET uuid = CONCAT('SWAG-PRODUCT-STREAM-UUID-', id) WHERE id IS NOT NULL;
UPDATE product_stream SET listing_sorting_uuid = CONCAT('SWAG-LISTING-SORTING-UUID-', listing_sorting_id) WHERE listing_sorting_id IS NOT NULL;
UPDATE product_stream_tab SET product_stream_uuid = CONCAT('SWAG-PRODUCT-STREAM-UUID-', product_stream_id) WHERE product_stream_id IS NOT NULL;
Expand Down Expand Up @@ -1791,7 +1791,7 @@ UPDATE media_attribute SET uuid = CONCAT('SWAG-MEDIA-ATTRIBUTE-UUID-', id);
UPDATE media_attribute SET media_uuid = CONCAT('SWAG-MEDIA-UUID-', media_id);
UPDATE premium_product SET uuid = CONCAT('SWAG-PREMIUM-PRODUCT-UUID-', id) WHERE id IS NOT NULL;
UPDATE premium_product SET shop_uuid = CONCAT('SWAG-SHOP-UUID-', shop_id) WHERE shop_id IS NOT NULL AND shop_id > 0;
UPDATE premium_product SET product_detail_uuid = CONCAT('SWAG-PRODUCT-DETAIL-UUID-', (SELECT p.id FROM product_detail p WHERE p.order_number = product_order_number));
UPDATE premium_product SET product_detail_uuid = (SELECT p.order_number FROM product_detail p WHERE p.order_number = product_order_number);
UPDATE attribute_configuration SET uuid = CONCAT('SWAG-ATTRIBUTE-CONFIGURATION-UUID-', id) WHERE id IS NOT NULL;
UPDATE blog SET uuid = CONCAT('SWAG-BLOG-UUID-', id) WHERE id IS NOT NULL;
UPDATE blog SET category_uuid = CONCAT('SWAG-CATEGORY-UUID-', category_id) WHERE category_id IS NOT NULL;
Expand Down Expand Up @@ -1860,12 +1860,12 @@ UPDATE locale SET uuid = CONCAT('SWAG-LOCALE-UUID-', id) WHERE id IS NOT NULL;
UPDATE product p SET p.uuid = CONCAT('SWAG-PRODUCT-UUID-', p.id);
UPDATE product p SET p.product_manufacturer_uuid = CONCAT('SWAG-PRODUCT-MANUFACTURER-UUID-', p.manufacturer_id) WHERE product_manufacturer_uuid IS NOT NULL;
UPDATE product p SET p.tax_uuid = CONCAT('SWAG-TAX-UUID-', p.tax_id) WHERE tax_id IS NOT NULL;
UPDATE product p SET p.main_detail_uuid = CONCAT('SWAG-PRODUCT-DETAIL-UUID-', p.main_detail_id) WHERE main_detail_id IS NOT NULL;
UPDATE product p SET p.main_detail_uuid = (SELECT sub.order_number FROM product_detail sub WHERE sub.id = p.main_detail_id LIMIT 1);
UPDATE product p SET p.filter_group_uuid = CONCAT('SWAG-FILTER-UUID-', p.filter_group_id) WHERE filter_group_id IS NOT NULL;
UPDATE product_also_bought_ro pabr SET pabr.product_uuid = CONCAT('SWAG-PRODUCT-UUID-',pabr.product_id) WHERE pabr.product_id IS NOT NULL;
UPDATE product_also_bought_ro pabr SET pabr.related_product_uuid = CONCAT('SWAG-PRODUCT-UUID-',pabr.related_product_id) WHERE related_product_id IS NOT NULL;
UPDATE product_attribute pa SET pa.uuid = CONCAT('SWAG-PRODUCT-ATTRIBUTE-UUID-', pa.id);
UPDATE product_attribute pa SET pa.product_detail_uuid = CONCAT('SWAG-PRODUCT-DETAIL-UUID-', pa.product_details_id);
UPDATE product_attribute pa SET pa.product_detail_uuid = (SELECT sub.order_number FROM product_detail sub WHERE sub.id = pa.product_details_id LIMIT 1);
UPDATE log SET uuid = CONCAT('SWAG-LOG-UUID-', id) WHERE id IS NOT NULL;
UPDATE payment_method SET uuid = CONCAT('SWAG-PAYMENT-METHOD-UUID-', id) WHERE id IS NOT NULL;
UPDATE payment_method_attribute SET uuid = CONCAT('SWAG-PAYMENT-METHOD-ATTRIBUTE-UUID-', id) WHERE id IS NOT NULL;
Expand Down Expand Up @@ -2088,7 +2088,7 @@ ALTER TABLE `product_avoid_customer_group`
ADD UNIQUE `product_uuid_customer_group_uuid` (`product_uuid`, `customer_group_uuid`);

ALTER TABLE `customer_address_attribute`
ADD UNIQUE `address_uuid` (`address_uuid`);
ADD UNIQUE `customer_address_uuid` (`customer_address_uuid`);

ALTER TABLE `product_category_seo`
ADD INDEX `shop_uuid_product_uuid` (`shop_uuid`, `product_uuid`),
Expand Down Expand Up @@ -2406,7 +2406,7 @@ FOREIGN KEY (area_country_uuid) REFERENCES area_country (uuid) ON DELETE CASCADE

ALTER TABLE customer_address_attribute
ADD CONSTRAINT `fk_customer_address_attribute.customer_address_uuid`
FOREIGN KEY (address_uuid) REFERENCES customer_address (uuid) ON DELETE CASCADE ON UPDATE CASCADE;
FOREIGN KEY (customer_address_uuid) REFERENCES customer_address (uuid) ON DELETE CASCADE ON UPDATE CASCADE;

ALTER TABLE customer_attribute
ADD CONSTRAINT `fk_customer_attribute.customer_uuid`
Expand Down

0 comments on commit 2bb793a

Please sign in to comment.