X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fdatabase%2FtableStructure.sql;h=ca57e515ccc8b80361372178a745c21a84752611;hp=301dabd28f9602855a72bee12b7ece1465c81056;hb=78aea4e2c6a8e99ba546c4189d7071d57c1aaf3b;hpb=6857b65a9147a61ef0e4c1286beb6d6c3f2f5404

diff --git a/src/org/cacert/gigi/database/tableStructure.sql b/src/org/cacert/gigi/database/tableStructure.sql
index 301dabd2..ca57e515 100644
--- a/src/org/cacert/gigi/database/tableStructure.sql
+++ b/src/org/cacert/gigi/database/tableStructure.sql
@@ -67,12 +67,9 @@ CREATE TABLE "emails" (
   "created" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   "modified" timestamp NULL DEFAULT NULL,
   "deleted" timestamp NULL DEFAULT NULL,
-  "hash" varchar(50) NOT NULL DEFAULT '',
-  "attempts" smallint NOT NULL DEFAULT '0',
   PRIMARY KEY ("id")
 );
 CREATE INDEX ON "emails" ("memid");
-CREATE INDEX ON "emails" ("hash");
 CREATE INDEX ON "emails" ("deleted");
 CREATE INDEX ON "emails" ("email");
 
@@ -90,7 +87,8 @@ CREATE TABLE "emailPinglog" (
   "email" varchar(255) NOT NULL,
   "type" "emailPingType" NOT NULL,
   "status" "pingState" NOT NULL,
-  "result" varchar(255) NOT NULL
+  "result" varchar(255) NOT NULL,
+  "challenge" varchar(255) NULL DEFAULT NULL
 );
 
 DROP TABLE IF EXISTS "pingconfig";
@@ -103,6 +101,7 @@ CREATE TABLE "pingconfig" (
   "domainid" int NOT NULL,
   "type" "pingType" NOT NULL,
   "info" varchar(255) NOT NULL,
+  "deleted" timestamp NULL DEFAULT NULL,
   PRIMARY KEY ("id")
 );
 
@@ -261,7 +260,7 @@ CREATE INDEX ON "jobs" ("state");
 DROP TABLE IF EXISTS "notary";
 
 DROP TYPE IF EXISTS "notaryType";
-CREATE TYPE "notaryType" AS enum('Face to Face Meeting', 'TOPUP', 'TTP-Assisted');
+CREATE TYPE "notaryType" AS enum('Face to Face Meeting', 'TOPUP', 'TTP-Assisted', 'Nucleus Bonus');
 
 CREATE TABLE "notary" (
   "id" serial NOT NULL,
@@ -326,7 +325,7 @@ CREATE TABLE IF NOT EXISTS "arbitrations" (
 DROP TABLE IF EXISTS "user_groups";
 
 DROP TYPE IF EXISTS "userGroup";
-CREATE TYPE "userGroup" AS enum('supporter','arbitrator','blockedassuree','blockedassurer','blockedlogin','ttp-assurer','ttp-applicant', 'codesigning', 'orgassurer');
+CREATE TYPE "userGroup" AS enum('supporter','arbitrator','blockedassuree','blockedassurer','blockedlogin','ttp-assurer','ttp-applicant', 'codesigning', 'orgassurer', 'blockedcert', 'nucleus-assurer');
 
 CREATE TABLE IF NOT EXISTS "user_groups" (
   "id" serial NOT NULL,
@@ -373,7 +372,7 @@ CREATE TABLE "schemeVersion" (
   "version" smallint NOT NULL,
   PRIMARY KEY ("version")
 );
-INSERT INTO "schemeVersion" (version)  VALUES(6);
+INSERT INTO "schemeVersion" (version)  VALUES(11);
 
 DROP TABLE IF EXISTS `passwordResetTickets`;
 CREATE TABLE `passwordResetTickets` (