add: country information where verification took place

[gigi.git] / src / org / cacert / gigi / database / tableStructure.sql

diff --git a/src/org/cacert/gigi/database/tableStructure.sql b/src/org/cacert/gigi/database/tableStructure.sql
index 9bd231e8c5f2efd7451beb730b85f9da5de8347c..a8d92f57dca3879a8c39aa2ddd5bb51c5b956598 100644 (file)
--- a/src/org/cacert/gigi/database/tableStructure.sql
+++ b/src/org/cacert/gigi/database/tableStructure.sql
@@ -160,7 +160,6 @@ CREATE TABLE "certs" (
   "revoked" timestamp NULL DEFAULT NULL,
   "expire" timestamp NULL DEFAULT NULL,
   "renewed" boolean NOT NULL DEFAULT 'false',
   "revoked" timestamp NULL DEFAULT NULL,
   "expire" timestamp NULL DEFAULT NULL,
   "renewed" boolean NOT NULL DEFAULT 'false',

-  "disablelogin" boolean NOT NULL DEFAULT 'false',

   "pkhash" char(40) DEFAULT NULL,
   "certhash" char(40) DEFAULT NULL,
   "description" varchar(100) NOT NULL DEFAULT '',
   "pkhash" char(40) DEFAULT NULL,
   "certhash" char(40) DEFAULT NULL,
   "description" varchar(100) NOT NULL DEFAULT '',


@@ -185,10 +184,9 @@ CREATE TABLE "certAvas" (
   PRIMARY KEY ("certId", "name")
 );
 
   PRIMARY KEY ("certId", "name")
 );
 

-DROP TABLE IF EXISTS "clientcerts";
-CREATE TABLE "clientcerts" (
+DROP TABLE IF EXISTS "logincerts";
+CREATE TABLE "logincerts" (

   "id" int NOT NULL,
   "id" int NOT NULL,

-  "disablelogin" boolean NOT NULL DEFAULT 'false',

 
   PRIMARY KEY ("id")
 );
 
   PRIMARY KEY ("id")
 );


@@ -273,6 +271,7 @@ CREATE TABLE "notary" (
   "sponsor" int NOT NULL DEFAULT '0',
 # date when verification was deleted (or 0)
   "deleted" timestamp NULL DEFAULT NULL,
   "sponsor" int NOT NULL DEFAULT '0',
 # date when verification was deleted (or 0)
   "deleted" timestamp NULL DEFAULT NULL,

+  "country" varchar(2) NULL,

   PRIMARY KEY ("id")
 );
 
   PRIMARY KEY ("id")
 );
 


@@ -374,7 +373,7 @@ CREATE TABLE "schemeVersion" (
   "version" smallint NOT NULL,
   PRIMARY KEY ("version")
 );
   "version" smallint NOT NULL,
   PRIMARY KEY ("version")
 );

-INSERT INTO "schemeVersion" (version)  VALUES(20);
+INSERT INTO "schemeVersion" (version)  VALUES(22);

 
 DROP TABLE IF EXISTS `passwordResetTickets`;
 CREATE TABLE `passwordResetTickets` (
 
 DROP TABLE IF EXISTS `passwordResetTickets`;
 CREATE TABLE `passwordResetTickets` (