Fixed SQL structure for PrivateKey

diff --git a/data/schema/6.sql b/data/schema/6.sql
index e4acd53515934d99c9268d1a5404113b6d06b690..cf9dd37a42027cbda308f635463266dbf0deb7cf 100644 (file)
--- a/data/schema/6.sql
+++ b/data/schema/6.sql
@@ -15,5 +15,5 @@ CREATE TABLE `sc_users_sslclientcerts` (
 ) CHARACTER SET utf8 COLLATE utf8_general_ci;
 
 ALTER TABLE `sc_users` ADD `privateKey` VARCHAR(33) NULL;
-CREATE INDEX `privateKey` ON `sc_users` (`privateKey`);
+CREATE UNIQUE INDEX `privateKey` ON `sc_users` (`privateKey`);
 

diff --git a/data/tables.sql b/data/tables.sql
index dd4e924287e2a4a6753dd27ef8d1a0ff1151203d..68d5ba97a6661765c22098648f237830b49df274 100644 (file)
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -72,7 +72,9 @@ CREATE TABLE `sc_users` (
   `email` varchar(50) NOT NULL default '',
   `homepage` varchar(255) default NULL,
   `uContent` text,
-  PRIMARY KEY  (`uId`)
+  `privateKey` varchar(33) default NULL,
+  PRIMARY KEY  (`uId`),
+  UNIQUE KEY `privateKey` (`privateKey`)
 ) CHARACTER SET utf8 COLLATE utf8_general_ci ;
 
 -- --------------------------------------------------------
@@ -84,9 +86,7 @@ CREATE TABLE `sc_users_sslclientcerts` (
   `sslClientIssuerDn` VARCHAR( 1024 ) NOT NULL ,
   `sslName` VARCHAR( 64 ) NOT NULL ,
   `sslEmail` VARCHAR( 64 ) NOT NULL ,
-  `privateKey` varchar(33) default NULL,
-  PRIMARY KEY ( `id` ) ,
-  UNIQUE KEY `privateKey` (`privateKey`)
+  PRIMARY KEY ( `id` )
 ) CHARACTER SET utf8 COLLATE utf8_general_ci;
 
 -- 

diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt
index fe8624a36d0240b910535e129ccb35227de3873d..53ccbf403f486738b3a4ac86d2e228e511c26d57 100644 (file)
--- a/doc/UPGRADE.txt
+++ b/doc/UPGRADE.txt
@@ -13,7 +13,7 @@ Database updates: Apply data/schema/6.sql or do the following:
     INSERT INTO `sc_version` (`schema_version`) VALUES ('6');
 
     ALTER TABLE `sc_users` ADD `privateKey` VARCHAR(33) NULL;
-    CREATE INDEX `privateKey` ON `sc_users` (`privateKey`);
+    CREATE UNIQUE INDEX `privateKey` ON `sc_users` (`privateKey`);
 
 
 From version 0.96 to 0.97