From b963961a09db63b2c0bf22ae3d44abd3911fd1f5 Mon Sep 17 00:00:00 2001 From: Janis Streib Date: Sat, 21 Mar 2015 22:55:42 +0100 Subject: [PATCH] UPD: Removed primary key in adminLog table --- src/org/cacert/gigi/database/DatabaseConnection.java | 2 +- src/org/cacert/gigi/database/tableStructure.sql | 4 ++-- src/org/cacert/gigi/database/upgrade/from_1.sql | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 src/org/cacert/gigi/database/upgrade/from_1.sql diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/org/cacert/gigi/database/DatabaseConnection.java index 5d987191..009aa6a6 100644 --- a/src/org/cacert/gigi/database/DatabaseConnection.java +++ b/src/org/cacert/gigi/database/DatabaseConnection.java @@ -15,7 +15,7 @@ import org.cacert.gigi.database.SQLFileManager.ImportType; public class DatabaseConnection { - public static final int CURRENT_SCHEMA_VERSION = 1; + public static final int CURRENT_SCHEMA_VERSION = 2; public static final int CONNECTION_TIMEOUT = 24 * 60 * 60; diff --git a/src/org/cacert/gigi/database/tableStructure.sql b/src/org/cacert/gigi/database/tableStructure.sql index e72c2701..85f9d779 100644 --- a/src/org/cacert/gigi/database/tableStructure.sql +++ b/src/org/cacert/gigi/database/tableStructure.sql @@ -339,7 +339,7 @@ CREATE TABLE `adminLog` ( `admin` int(11) unsigned NOT NULL, `type` varchar(100) NOT NULL DEFAULT '', `information` varchar(50) NOT NULL DEFAULT '', - PRIMARY KEY (`when`) + KEY (`when`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `schemeVersion`; @@ -347,4 +347,4 @@ CREATE TABLE `schemeVersion` ( `version` int(5) NOT NULL, PRIMARY KEY (`version`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -INSERT INTO schemeVersion(version) VALUES(1); +INSERT INTO schemeVersion(version) VALUES(2); diff --git a/src/org/cacert/gigi/database/upgrade/from_1.sql b/src/org/cacert/gigi/database/upgrade/from_1.sql new file mode 100644 index 00000000..e7c25770 --- /dev/null +++ b/src/org/cacert/gigi/database/upgrade/from_1.sql @@ -0,0 +1,3 @@ +ALTER TABLE adminLog DROP PRIMARY KEY; +ALTER TABLE `adminLog` ADD INDEX(`when`); + -- 2.39.2