UPD: cleanup reminders of old table.

diff --git a/doc/tableStructure.sql b/doc/tableStructure.sql
index c141f0adf35f7973effb24899a41f14da7ba5205..8fd14c8807c1cdf7f6e04d2c18a914411e41de92 100644 (file)
--- a/doc/tableStructure.sql
+++ b/doc/tableStructure.sql
@@ -67,7 +67,7 @@ DROP TABLE IF EXISTS `emailPinglog`;
 CREATE TABLE `emailPinglog` (
   `when` datetime NOT NULL,
   `uid` int(11) NOT NULL,
-  `emailid` int(11) NOT NULL,
+  `email` varchar(255) NOT NULL,
   `type` enum('fast', 'active') NOT NULL,
   `status` enum('open', 'success', 'failed') NOT NULL,
   `result` varchar(255) NOT NULL

diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java
index 64902429c6d611547d3cb76c2e21d24d1b09ee3d..b67c44306e1a8af00dbf01de879ee10779e9d6cc 100644 (file)
--- a/src/org/cacert/gigi/email/EmailProvider.java
+++ b/src/org/cacert/gigi/email/EmailProvider.java
@@ -115,7 +115,7 @@ public abstract class EmailProvider {
                     pw.print("QUIT\r\n");
                     pw.flush();
 
-                    GigiPreparedStatement statmt = DatabaseConnection.getInstance().prepare("insert into `pinglog` set `when`=NOW(), `email`=?, `result`=?, `uid`=?");
+                    GigiPreparedStatement statmt = DatabaseConnection.getInstance().prepare("insert into `emailPinglog` set `when`=NOW(), `email`=?, `result`=?, `uid`=?");
                     statmt.setString(1, address);
                     statmt.setString(2, line);
                     statmt.setInt(3, forUid);
@@ -130,7 +130,7 @@ public abstract class EmailProvider {
 
             }
         }
-        GigiPreparedStatement statmt = DatabaseConnection.getInstance().prepare("insert into `pinglog` set `when`=NOW(), `email`=?, `result`=?, `uid`=?");
+        GigiPreparedStatement statmt = DatabaseConnection.getInstance().prepare("insert into `emailPinglog` set `when`=NOW(), `email`=?, `result`=?, `uid`=?");
         statmt.setString(1, address);
         statmt.setString(2, "Failed to make a connection to the mail server");
         statmt.setInt(3, forUid);