Rename email and domain table to plural.

diff --git a/doc/tableStructure.sql b/doc/tableStructure.sql
index 2012fb1903c61bfc7d94f93a178c7b5e7f519122..76babce874bb48494cb613d01bc8e23231725db5 100644 (file)
--- a/doc/tableStructure.sql
+++ b/doc/tableStructure.sql
@@ -31,8 +31,8 @@ CREATE TABLE `users` (
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
 
-DROP TABLE IF EXISTS `domain`;
-CREATE TABLE `domain` (
+DROP TABLE IF EXISTS `domains`;
+CREATE TABLE `domains` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `memid` int(11) NOT NULL,
   `domain` varchar(255) NOT NULL,
@@ -45,8 +45,8 @@ CREATE TABLE `domain` (
   KEY `stats_domains_deleted` (`deleted`)
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1;
 
-DROP TABLE IF EXISTS `email`;
-CREATE TABLE `email` (
+DROP TABLE IF EXISTS `emails`;
+CREATE TABLE `emails` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `memid` int(11) NOT NULL DEFAULT '0',
   `email` varchar(255) NOT NULL DEFAULT '',

diff --git a/src/org/cacert/gigi/Domain.java b/src/org/cacert/gigi/Domain.java
index 246dbc145ff8152b13e0021b30b8b1a09074ec59..0adf6a4c2d31683f3b3da15a4299d7c0f48ff299 100644 (file)
--- a/src/org/cacert/gigi/Domain.java
+++ b/src/org/cacert/gigi/Domain.java
@@ -15,7 +15,7 @@ public class Domain {
     int id;
 
     public Domain(int id) throws SQLException {
-        PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid, domain FROM `domain` WHERE id=? AND deleted IS NULL");
+        PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid, domain FROM `domains` WHERE id=? AND deleted IS NULL");
         ps.setInt(1, id);
 
         ResultSet rs = ps.executeQuery();
@@ -36,7 +36,7 @@ public class Domain {
 
     private static void checkInsert(String suffix) throws GigiApiException {
         try {
-            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `domain` WHERE (domain=RIGHT(?,LENGTH(domain))  OR RIGHT(domain,LENGTH(?))=?) AND deleted IS NULL");
+            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `domains` WHERE (domain=RIGHT(?,LENGTH(domain))  OR RIGHT(domain,LENGTH(?))=?) AND deleted IS NULL");
             ps.setString(1, suffix);
             ps.setString(2, suffix);
             ps.setString(3, suffix);
@@ -58,7 +58,7 @@ public class Domain {
         synchronized (Domain.class) {
             checkInsert(suffix);
             try {
-                PreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `domain` SET memid=?, domain=?");
+                PreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `domains` SET memid=?, domain=?");
                 ps.setInt(1, owner.getId());
                 ps.setString(2, suffix);
                 ps.execute();
@@ -74,7 +74,7 @@ public class Domain {
             throw new GigiApiException("not inserted.");
         }
         try {
-            PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `domain` SET deleted=CURRENT_TIMESTAMP WHERE id=?");
+            PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `domains` SET deleted=CURRENT_TIMESTAMP WHERE id=?");
             ps.setInt(1, id);
             ps.execute();
         } catch (SQLException e) {

diff --git a/src/org/cacert/gigi/EmailAddress.java b/src/org/cacert/gigi/EmailAddress.java
index 365e95388a707f385b275e613e63238551c4a7ac..8f4e2efd000a32c7e090bcb96c9901089693e4f6 100644 (file)
--- a/src/org/cacert/gigi/EmailAddress.java
+++ b/src/org/cacert/gigi/EmailAddress.java
@@ -21,7 +21,7 @@ public class EmailAddress {
     private String hash = null;
 
     private EmailAddress(int id) throws SQLException {
-        PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid, email, hash FROM `email` WHERE id=? AND deleted=0");
+        PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid, email, hash FROM `emails` WHERE id=? AND deleted=0");
         ps.setInt(1, id);
 
         ResultSet rs = ps.executeQuery();
@@ -49,7 +49,7 @@ public class EmailAddress {
             throw new IllegalStateException("already inserted.");
         }
         try {
-            PreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `email` SET memid=?, hash=?, email=?");
+            PreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `emails` SET memid=?, hash=?, email=?");
             ps.setInt(1, owner.getId());
             ps.setString(2, hash);
             ps.setString(3, address);
@@ -87,7 +87,7 @@ public class EmailAddress {
         if (this.hash.equals(hash)) {
 
             try {
-                PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `email` SET hash='' WHERE id=?");
+                PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `emails` SET hash='' WHERE id=?");
                 ps.setInt(1, id);
                 ps.execute();
                 hash = "";

diff --git a/src/org/cacert/gigi/User.java b/src/org/cacert/gigi/User.java
index f6d3c548ce51a7b608c508f4cb67425747820b7f..47da71886c17646598cece3d123445b3bb7e84da 100644 (file)
--- a/src/org/cacert/gigi/User.java
+++ b/src/org/cacert/gigi/User.java
@@ -241,7 +241,7 @@ public class User {
 
     public EmailAddress[] getEmails() {
         try {
-            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM email WHERE memid=? AND deleted=0");
+            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM emails WHERE memid=? AND deleted=0");
             ps.setInt(1, id);
             ResultSet rs = ps.executeQuery();
             rs.last();
@@ -265,7 +265,7 @@ public class User {
 
     public Domain[] getDomains() {
         try {
-            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM domain WHERE memid=? AND deleted IS NULL");
+            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM domains WHERE memid=? AND deleted IS NULL");
             ps.setInt(1, id);
             ResultSet rs = ps.executeQuery();
             rs.last();
@@ -317,7 +317,7 @@ public class User {
         for (int i = 0; i < emails.length; i++) {
             if (emails[i].getId() == mail.getId()) {
                 try {
-                    PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE email SET deleted=? WHERE id=?");
+                    PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE emails SET deleted=? WHERE id=?");
                     ps.setDate(1, new Date(System.currentTimeMillis()));
                     ps.setInt(2, mail.getId());
                     ps.execute();

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index f2ed2ff51ef5ca3cef9e3388d74c7a0568008f5d..9a76f8723ee99573a712a7ad852c1a45b0be694c 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -126,7 +126,7 @@ public class Signup extends Form {
             return false;
         }
         try {
-            PreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `email` where `email`=? and `deleted`=0");
+            PreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `emails` where `email`=? and `deleted`=0");
             PreparedStatement q2 = DatabaseConnection.getInstance().prepare("select * from `users` where `email`=? and `deleted`=0");
             q1.setString(1, buildup.getEmail());
             q2.setString(1, buildup.getEmail());