X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fglobal.cpp;h=a9477679f30ffd2aec00de69a612452eace6a8fe;hp=5515e1ad85b9b6dd7e0f752e727193e8e78b38c8;hb=4430e7762844c66428b6f822288beb71b7f82b95;hpb=ee580d19b7920904587e18d72a3465d52eab6204

diff --git a/src/global.cpp b/src/global.cpp
index 5515e1a..a947767 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -58,13 +58,19 @@ void SetupDB()
 			major=1;
 			minor=3;
 		}
+		if(major==1 && minor==3)
+		{
+			ConvertDB0103To0104();
+			major=1;
+			minor=4;
+		}
 	}
 	else
 	{
-		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,1);");
+		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,4);");
 	}
 
-	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=3;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=4;");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblOption(\
 				Option				TEXT UNIQUE,\
@@ -89,7 +95,8 @@ void SetupDB()
 				InsertingBoardList		BOOL CHECK(InsertingBoardList IN('true','false')) DEFAULT 'false',\
 				LastInsertedBoardList	DATETIME,\
 				InsertingMessageList	BOOL CHECK(InsertingMessageList IN('true','false')) DEFAULT 'false',\
-				LastInsertedMessageList	DATETIME\
+				LastInsertedMessageList	DATETIME,\
+				DateCreated				DATETIME\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblLocalIdentityInserts(\
@@ -193,7 +200,8 @@ void SetupDB()
 				Subject				TEXT,\
 				MessageUUID			TEXT UNIQUE,\
 				ReplyBoardID		INTEGER,\
-				Body				TEXT\
+				Body				TEXT,\
+				MessageIndex		INTEGER\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageReplyTo(\
@@ -222,6 +230,8 @@ void SetupDB()
 				Found				BOOL CHECK(Found IN('true','false')) DEFAULT 'false'\
 				);");
 
+	db->Execute("CREATE UNIQUE INDEX IF NOT EXISTS idxMessageRequest ON tblMessageRequests(IdentityID,Day,RequestIndex);");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageInserts(\
 				LocalIdentityID		INTEGER,\
 				Day					DATE,\
@@ -437,6 +447,19 @@ void ConvertDB0101To0103()
 	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=3;");
 }
 
+void ConvertDB0103To0104()
+{
+	// add MessageIndex to tblMessage
+	DateTime date;
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("ALTER TABLE tblMessage ADD COLUMN MessageIndex	INTEGER;");
+	db->Execute("CREATE UNIQUE INDEX IF NOT EXISTS idxMessageRequest ON tblMessageRequests(IdentityID,Day,RequestIndex);");
+	db->Execute("ALTER TABLE tblLocalIdentity ADD COLUMN DateCreated DATETIME;");
+	date.SetToGMTime();
+	db->Execute("UPDATE tblLocalIdentity SET DateCreated='"+date.Format("%Y-%m-%d %H:%M:%S")+"' WHERE DateCreated IS NULL;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=4;");
+}
+
 void SetupDefaultOptions()
 {
 	// OptionValue should always be inserted as a string, even if the option really isn't a string - just to keep the field data type consistent