From 48c240b3830dd47c77a1b15712659cef74c96ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Cohen=20Arazi?= Date: Fri, 31 Jul 2015 12:41:48 -0300 Subject: [PATCH] [SIGNED OFF] Bug 10363: (QA followup) DB update / atomic update This patch just moves the DB update code into an atomicupdate file to avoid nasty merge conflicts. Signed-off-by: Tomas Cohen Arazi --- .../data/mysql/atomicupdate/bug_10363_av_package.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/bug_10363_av_package.sql diff --git a/installer/data/mysql/atomicupdate/bug_10363_av_package.sql b/installer/data/mysql/atomicupdate/bug_10363_av_package.sql new file mode 100644 index 0000000..18445d9 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_10363_av_package.sql @@ -0,0 +1,16 @@ +ALTER TABLE authorised_values_branches + CHANGE av_id av_id INT( 11 ) NOT NULL, + CHANGE branchcode branchcode VARCHAR( 10 ) NOT NULL; + +/* +$DBversion = "3.21.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + ALTER TABLE authorised_values_branches + CHANGE av_id av_id INT( 11 ) NOT NULL, + CHANGE branchcode branchcode VARCHAR( 10 ) NOT NULL + }); + print "Upgrade to $DBversion done (Bug 10363: There is no package for authorised values)\n"; + SetVersion($DBversion); +} +*/ -- 2.5.0