From d3204975b47e6989ef0422a64c338b57deed1aae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 5 Nov 2017 00:25:22 +0100 Subject: [PATCH] chg: remove csr_name and crt_name columns from certs Change-Id: I46ae11f8a158547f4b1c1e1ddf062f6016e36af0 --- src/club/wpia/gigi/database/DatabaseConnection.java | 2 +- src/club/wpia/gigi/database/tableStructure.sql | 5 +---- src/club/wpia/gigi/database/upgrade/from_32.sql | 2 ++ .../club/wpia/gigi/localisation/TranslationCollector.java | 5 ++++- 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 src/club/wpia/gigi/database/upgrade/from_32.sql diff --git a/src/club/wpia/gigi/database/DatabaseConnection.java b/src/club/wpia/gigi/database/DatabaseConnection.java index c8bb4399..20125a81 100644 --- a/src/club/wpia/gigi/database/DatabaseConnection.java +++ b/src/club/wpia/gigi/database/DatabaseConnection.java @@ -181,7 +181,7 @@ public class DatabaseConnection { } - public static final int CURRENT_SCHEMA_VERSION = 32; + public static final int CURRENT_SCHEMA_VERSION = 33; public static final int CONNECTION_TIMEOUT = 24 * 60 * 60; diff --git a/src/club/wpia/gigi/database/tableStructure.sql b/src/club/wpia/gigi/database/tableStructure.sql index 41da72a3..bf457af3 100644 --- a/src/club/wpia/gigi/database/tableStructure.sql +++ b/src/club/wpia/gigi/database/tableStructure.sql @@ -156,9 +156,7 @@ CREATE TABLE "certs" ( "profile" int NOT NULL, "caid" int NULL DEFAULT NULL, - "csr_name" varchar(255) NOT NULL DEFAULT '', "csr_type" "csrType" NOT NULL, - "crt_name" varchar(255) NOT NULL DEFAULT '', "created" timestamp NULL DEFAULT NULL, "modified" timestamp NULL DEFAULT NULL, @@ -181,7 +179,6 @@ CREATE INDEX ON "certs" ("created"); CREATE INDEX ON "certs" ("memid"); CREATE INDEX ON "certs" ("serial"); CREATE INDEX ON "certs" ("expire"); -CREATE INDEX ON "certs" ("crt_name"); DROP TABLE IF EXISTS "certAvas"; CREATE TABLE "certAvas" ( @@ -381,7 +378,7 @@ CREATE TABLE "schemeVersion" ( "version" smallint NOT NULL, PRIMARY KEY ("version") ); -INSERT INTO "schemeVersion" (version) VALUES(32); +INSERT INTO "schemeVersion" (version) VALUES(33); DROP TABLE IF EXISTS `passwordResetTickets`; CREATE TABLE `passwordResetTickets` ( diff --git a/src/club/wpia/gigi/database/upgrade/from_32.sql b/src/club/wpia/gigi/database/upgrade/from_32.sql new file mode 100644 index 00000000..6cee9bbd --- /dev/null +++ b/src/club/wpia/gigi/database/upgrade/from_32.sql @@ -0,0 +1,2 @@ +ALTER TABLE "certs" DROP COLUMN "csr_name"; +ALTER TABLE "certs" DROP COLUMN "crt_name"; diff --git a/util-testing/club/wpia/gigi/localisation/TranslationCollector.java b/util-testing/club/wpia/gigi/localisation/TranslationCollector.java index 239c32fb..2883efd0 100644 --- a/util-testing/club/wpia/gigi/localisation/TranslationCollector.java +++ b/util-testing/club/wpia/gigi/localisation/TranslationCollector.java @@ -219,7 +219,10 @@ public class TranslationCollector { throw new Error(); } } - + // Skip Database connection as some statements need to be run on older DB scheme version. + if(new String(parsedUnit.getFileName()).endsWith("/src/club/wpia/gigi/database/DatabaseConnection.java")) { + continue; + } if (parsedUnit.types == null) { System.err.println("No types"); -- 2.39.2