From ec345f7a1343769abdf3f5920a0732b24726b733 Mon Sep 17 00:00:00 2001
From: Mark Pemberton
Date: Fri, 13 May 2011 14:26:51 -0400
Subject: new privatekey2 branch with privatekey changes

---
 data/tables.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'data/tables.sql')

diff --git a/data/tables.sql b/data/tables.sql
index d53945e..dd4e924 100644
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -84,8 +84,9 @@ 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 (`id`)
+  UNIQUE KEY `privateKey` (`privateKey`)
 ) CHARACTER SET utf8 COLLATE utf8_general_ci;
 
 -- 
-- 
cgit v1.2.3-54-g00ecf


From 16791766dee4f9c03700b7c817063071e4d0ed33 Mon Sep 17 00:00:00 2001
From: Mark Pemberton
Date: Sat, 14 May 2011 23:08:46 -0400
Subject: Fixed SQL structure for PrivateKey

---
 data/schema/6.sql | 2 +-
 data/tables.sql   | 8 ++++----
 doc/UPGRADE.txt   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'data/tables.sql')

diff --git a/data/schema/6.sql b/data/schema/6.sql
index e4acd53..cf9dd37 100644
--- 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 dd4e924..68d5ba9 100644
--- 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 fe8624a..53ccbf4 100644
--- 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
-- 
cgit v1.2.3-54-g00ecf