summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-11-27 00:20:48 +0100
committerMichael Tänzer <neo@nhng.de>2013-11-27 00:20:48 +0100
commit5113c1bad518e981774ba67dd49a1f6d1f66175e (patch)
treee9a4e2d773da0f106ff9f23f02de395454903f36 /scripts
parentf538173e9c9a02d493c32404cb9a4dd6f3e044d5 (diff)
parentd769eb50a3b878d0828679728a623985536df3eb (diff)
downloadcacert-devel-5113c1bad518e981774ba67dd49a1f6d1f66175e.tar.gz
cacert-devel-5113c1bad518e981774ba67dd49a1f6d1f66175e.tar.xz
cacert-devel-5113c1bad518e981774ba67dd49a1f6d1f66175e.zip
Merge branch 'bug-1135' into testserver-stable
Diffstat (limited to 'scripts')
-rw-r--r--scripts/db_migrations/version3.sh14
-rw-r--r--scripts/db_migrations/version4.sh10
2 files changed, 12 insertions, 12 deletions
diff --git a/scripts/db_migrations/version3.sh b/scripts/db_migrations/version3.sh
index cbaa9ac..8febfe7 100644
--- a/scripts/db_migrations/version3.sh
+++ b/scripts/db_migrations/version3.sh
@@ -53,7 +53,7 @@ SQL
if [ $schema_version != 2 ]; then
cat >&$STDERR <<- ERROR
Error: database schema is not in the right version to do the migration!
- Expected version: 2 (i.e. the version before there was versioning)
+ Expected version: 2
ERROR
exit 2
fi
@@ -64,7 +64,7 @@ mysql $mysql_opt <<- 'SQL'
-- alter table Admin log
ALTER TABLE `adminlog` ADD `type` VARCHAR( 50 ) NOT NULL ,
- ADD `information` VARCHAR( 50 ) NOT NULL
+ ADD `information` VARCHAR( 50 ) NOT NULL;
-- create new table OrgAdminLog
@@ -73,16 +73,16 @@ CREATE TABLE IF NOT EXISTS `orgadminlog` (
`oid` int(11) NOT NULL,
`adminid` int(11) NOT NULL,
`type` varchar(50) NOT NULL,
- `information` varchar(100) NOT NULL
+ `information` varchar(50) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-- alter table OrgDomainCerts
-ALTER TABLE `OrgDomainCerts` ADD orgadminid int(11) NULL,
- ADD revokeorgadminid int(11) NULL
+ALTER TABLE `orgdomaincerts` ADD orgadminid int(11) NULL,
+ ADD revokeorgadminid int(11) NULL;
-- alter table OrgEmailCerts
-ALTER TABLE `OrgEmailCerts` ADD orgadminid int(11) NULL,
- ADD revokeorgadminid int(11) NULL
+ALTER TABLE `orgemailcerts` ADD orgadminid int(11) NULL,
+ ADD revokeorgadminid int(11) NULL;
diff --git a/scripts/db_migrations/version4.sh b/scripts/db_migrations/version4.sh
index f59816d..9a8aded 100644
--- a/scripts/db_migrations/version4.sh
+++ b/scripts/db_migrations/version4.sh
@@ -53,7 +53,7 @@ SQL
if [ $schema_version != 3 ]; then
cat >&$STDERR <<- ERROR
Error: database schema is not in the right version to do the migration!
- Expected version: 3 (i.e. the version before there was versioning)
+ Expected version: 3
ERROR
exit 2
fi
@@ -62,22 +62,22 @@ mysql $mysql_opt <<- 'SQL'
-- dump table AdminLog
SELECT *
- INTO OUTFILE "???"
+ INTO OUTFILE "adminlog_table_backup_1135"
FIELDS TERMINATED BY ','
OPTIONALLY ENCLOSED BY '"'
LINES TERMINATED BY "\n"
- FROM `adminlog`
+ FROM `adminlog`;
SQL
-echo "Dump table create in ???"
+echo "Dump table create in adminlog_table_backup_1135"
mysql $mysql_opt <<- 'SQL'
-- update table admin log
UPDATE `adminlog` SET `type` = 'old name or dob change',
-`information` = 'see dump ???'
+`information` = 'see adminlog_table_backup_1135';
-- alter table admin log