--- mqtt/etc/mqtt_pub.sql	2011/11/25 12:47:13	1.1.2.5
+++ mqtt/etc/mqtt_pub.sql	2011/12/16 02:09:19	1.1.2.10
@@ -1,12 +1,19 @@
 PRAGMA foreign_keys=ON;
 BEGIN TRANSACTION;
-CREATE TABLE Online (
-Username varchar(64) not null,
+CREATE TABLE IF NOT EXISTS Online (
+ConnID varchar(23) not null primary key, 
+Username varchar(12) not null,
 RemoteHost varchar(64) not null,
-RemotePort smallint unsigned not null,
+WillFlag tinyint not null,
+WillTopic text,
+WillMsg text,
+WillQoS tinyint,
+WillRetain tinyint,
 Stamp timestamp);
-CREATE TABLE Topics (
+CREATE TABLE IF NOT EXISTS Topics (
 id integer not null primary key,
+MsgID smallint unsigned not null, 
+QoS char not null,
 Retain char not null,
 Topic varchar(255) not null,
 Value text,
@@ -14,27 +21,27 @@ PubUser varchar(64) not null,
 PubDate datetime not null,
 PubHost varchar(64) not null,
 Stamp timestamp);
-CREATE INDEX RemoteHost on Online (RemoteHost);
-CREATE INDEX Username on Online (Username);
-CREATE UNIQUE INDEX User on Online (Username, RemoteHost);
-CREATE INDEX PubDate on Topics (PubDate);
-CREATE INDEX PubHost on Topics (PubHost);
-CREATE INDEX PubUser on Topics (PubUser);
-CREATE INDEX Topic on Topics (Topic);
-CREATE TRIGGER Online_update_t AFTER UPDATE ON Online
+CREATE INDEX IF NOT EXISTS RemoteHost on Online (RemoteHost);
+CREATE INDEX IF NOT EXISTS Username on Online (Username);
+CREATE INDEX IF NOT EXISTS PubDate on Topics (PubDate);
+CREATE INDEX IF NOT EXISTS PubHost on Topics (PubHost);
+CREATE INDEX IF NOT EXISTS PubUser on Topics (PubUser);
+CREATE INDEX IF NOT EXISTS MsgID on Topics (MsgID);
+CREATE INDEX IF NOT EXISTS Topic on Topics (Topic);
+CREATE TRIGGER IF NOT EXISTS Online_update_t AFTER UPDATE ON Online
 BEGIN
-	UPDATE Online SET Stamp = strftime("%s", "now") WHERE Username = old.Username;
+	UPDATE Online SET Stamp = strftime('%s', 'now') WHERE ConnID = old.ConnID;
 END;
-CREATE TRIGGER Online_insert_t AFTER INSERT ON Online
+CREATE TRIGGER IF NOT EXISTS Online_insert_t AFTER INSERT ON Online
 BEGIN
-	UPDATE Online SET Stamp = strftime("%s", "now") WHERE Username = new.Username;
+	UPDATE Online SET Stamp = strftime('%s', 'now') WHERE ConnID = new.ConnID;
 END;
-CREATE TRIGGER Topics_update_t AFTER UPDATE ON Topics
+CREATE TRIGGER IF NOT EXISTS Topics_update_t AFTER UPDATE ON Topics
 BEGIN
-	UPDATE Topics SET Stamp = strftime("%s", "now") WHERE id = old.id;
+	UPDATE Topics SET Stamp = strftime('%s', 'now') WHERE id = old.id;
 END;
-CREATE TRIGGER Topics_insert_t AFTER INSERT ON Topics
+CREATE TRIGGER IF NOT EXISTS Topics_insert_t AFTER INSERT ON Topics
 BEGIN
-	UPDATE Topics SET Stamp = strftime("%s", "now") WHERE id = new.id;
+	UPDATE Topics SET Stamp = strftime('%s', 'now') WHERE id = new.id;
 END;
 COMMIT;