chg: remove csr_name and crt_name columns from certs

Change-Id: I46ae11f8a158547f4b1c1e1ddf062f6016e36af0

diff --git a/src/club/wpia/gigi/database/DatabaseConnection.java b/src/club/wpia/gigi/database/DatabaseConnection.java
index c8bb43997966e6bbba604983dbfb7905e6d2a67c..20125a81e0f54420e79508244eae7d05bf0fbdad 100644 (file)
--- 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 41da72a3ed9b5565268d8dcc90a74dcced199373..bf457af37f3ee6acbac12fa65281677bdbd6f9e1 100644 (file)
--- 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 (file)
index 0000000..6cee9bb
--- /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 239c32fb7ce9a5a42330882b11ed288f677a091b..2883efd0d5042b8a05ff437171f7954fd2beacf3 100644 (file)
--- 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");