bug 1135: split db change into to version3.sh fot the first step to change add the columns into Adminlog and create table OrgAdminlog. Second step clean up after software is changes in logging are added

1 files changed, 8 insertions, 33 deletions

diff --git a/scripts/db_migrations/version3.sh b/scripts/db_migrations/version3.sh
index c5b4b8c..2bf90e9 100644
--- a/scripts/db_migrations/version3.sh
+++ b/scripts/db_migrations/version3.sh
@@ -1,16 +1,16 @@
 #!/bin/sh
 # LibreSSL - CAcert web application
 # Copyright (C) 2004-2011  CAcert Inc.
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,7 +20,7 @@
 # script to do database migrations
 
 # This particular version migrates from the preversioned state to version 1
-# If you want to reuse it for further migrations you probably should pay special 
+# If you want to reuse it for further migrations you probably should pay special
 # attention because you have to adjust it a bit
 
 set -e # script fails if any command fails
@@ -53,46 +53,21 @@ SQL
 if [ $schema_version != 2 ]; then
 	cat >&$STDERR <<- ERROR
 		Error: database schema is not in the right version to do the migration!
-		Expected version: 1 (i.e. the version before there was versioning)
+		Expected version: 2 (i.e. the version before there was versioning)
 	ERROR
 	exit 2
 fi
 
 mysql $mysql_opt <<- 'SQL'
 
--- dump table AdminLog
-SELECT * 
-  INTO OUTFILE "???"
-  FIELDS TERMINATED BY ','
-  OPTIONALLY ENCLOSED BY '"'
-  LINES TERMINATED BY "\n"
-  FROM `adminlog` 
 
-  echo "Dump table create in ???"
-  
 -- alter table Admin log
-	
-ALTER TABLE `adminlog` ADD `type` VARCHAR( 50 ) NOT NULL ,
-  ADD `information` VARCHAR( 50 ) NOT NULL 
-
--- update table admin log
-
-UPDATE `adminlog` SET `type` = 'old name or dob change',
-`information` = 'see dump ???'
-
--- alter table admin log
-
-ALTER TABLE `adminlog`
-  DROP `old-lname`,
-  DROP `old-dob`,
-  DROP `new-lname`,
-  DROP `new-dob`;
 
+ALTER TABLE `adminlog` ADD `type` VARCHAR( 50 ) NOT NULL ,
+  ADD `information` VARCHAR( 50 ) NOT NULL
 
 -- create new table OrgAdminLog
 
-
-DROP TABLE IF EXISTS `orgadminlog`;
 CREATE TABLE IF NOT EXISTS `orgadminlog` (
   `when` datetime NOT NULL,
   `oid` int(11) NOT NULL,
@@ -102,7 +77,7 @@ CREATE TABLE IF NOT EXISTS `orgadminlog` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 
-	
+
 	-- Update schema version number
 	INSERT INTO `schema_version`
 		(`version`, `when`) VALUES