From 125b81f24739c4568bb4340bbe5db78c2d4548e6 Mon Sep 17 00:00:00 2001 From: Yung Han Khoe Date: Fri, 27 Feb 2009 01:29:07 +0000 Subject: [PATCH] fixing a Matrix upgrade bug --- docs/upgrades/upgrade_7.5.40-7.6.10.pl | 3 ++- docs/upgrades/upgrade_7.6.3-7.6.4.pl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/upgrades/upgrade_7.5.40-7.6.10.pl b/docs/upgrades/upgrade_7.5.40-7.6.10.pl index c76b2ab03..c96d7223c 100644 --- a/docs/upgrades/upgrade_7.5.40-7.6.10.pl +++ b/docs/upgrades/upgrade_7.5.40-7.6.10.pl @@ -295,7 +295,8 @@ sub upgradeMatrix { $db->write("alter table Matrix_rating rename MatrixListing_rating"); $db->write("alter table Matrix_ratingSummary rename MatrixListing_ratingSummary"); $db->write("alter table Matrix_field rename Matrix_attribute"); - $db->write("alter table Matrix_attribute drop column label"); + $db->write("alter table Matrix_attribute drop column name"); + $db->write("alter table Matrix_attribute change label name char(255)"); $db->write("alter table Matrix_attribute add column options text"); $db->write("alter table Matrix_attribute change fieldType fieldType char(255) not null default 'MatrixCompare'"); $db->write("alter table Matrix_attribute change fieldId attributeId char(22) not null"); diff --git a/docs/upgrades/upgrade_7.6.3-7.6.4.pl b/docs/upgrades/upgrade_7.6.3-7.6.4.pl index d0a33beac..b47fb0534 100644 --- a/docs/upgrades/upgrade_7.6.3-7.6.4.pl +++ b/docs/upgrades/upgrade_7.6.3-7.6.4.pl @@ -102,7 +102,8 @@ sub upgradeMatrix { $db->write("alter table Matrix_rating rename MatrixListing_rating"); $db->write("alter table Matrix_ratingSummary rename MatrixListing_ratingSummary"); $db->write("alter table Matrix_field rename Matrix_attribute"); - $db->write("alter table Matrix_attribute drop column label"); + $db->write("alter table Matrix_attribute drop column name"); + $db->write("alter table Matrix_attribute change label name char(255)"); $db->write("alter table Matrix_attribute add column options text"); $db->write("alter table Matrix_attribute change fieldType fieldType char(255) not null default 'MatrixCompare'"); $db->write("alter table Matrix_attribute change fieldId attributeId char(22) not null");