X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fdbsetup.cpp;h=9b2ab003a6d5ea31f04d6679886624472e9d3480;hb=b88f50bfec6dbcd169bb8285e7c42b93baf52b6b;hp=68ee6768c0445f2fc1f7485e98230cdf93c1177f;hpb=76805933f794915a72b7f0a21b12af6654759f4f;p=fms.git

diff --git a/src/dbsetup.cpp b/src/dbsetup.cpp
index 68ee676..9b2ab00 100644
--- a/src/dbsetup.cpp
+++ b/src/dbsetup.cpp
@@ -17,13 +17,6 @@ void SetupDB()
 	db->Open("fms.db3");
 	db->SetBusyTimeout(20000);		// set timeout to 20 seconds
 
-	tempval="";
-	Option::Instance()->Get("VacuumOnStartup",tempval);
-	if(tempval=="true")
-	{
-		db->Execute("VACUUM;");
-	}
-
 	db->Execute("CREATE TABLE IF NOT EXISTS tblDBVersion(\
 				Major				INTEGER,\
 				Minor				INTEGER\
@@ -104,13 +97,19 @@ void SetupDB()
 			major=1;
 			minor=12;
 		}
+		if(major==1 && minor==12)
+		{
+			ConvertDB0112To0113();
+			major=1;
+			minor=13;
+		}
 	}
 	else
 	{
-		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,12);");
+		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,13);");
 	}
 
-	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=12;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=13;");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblFMSVersion(\
 				Major				INTEGER,\
@@ -188,6 +187,9 @@ void SetupDB()
 				FoundSolution		BOOL CHECK(FoundSolution IN('true','false')) DEFAULT 'false'\
 				);");
 
+	/*
+		PurgeDate is not used yet
+	*/
 	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentity(\
 				IdentityID				INTEGER PRIMARY KEY,\
 				PublicKey				TEXT UNIQUE,\
@@ -326,12 +328,17 @@ void SetupDB()
 				Found				BOOL CHECK(Found IN('true','false')) DEFAULT 'false'\
 				);");
 
+	/*
+		Key is for anonymous messages (future)
+	*/
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageRequests(\
 				IdentityID			INTEGER,\
 				Day					DATE,\
 				RequestIndex		INTEGER,\
 				FromMessageList		BOOL CHECK(FromMessageList IN('true','false')) DEFAULT 'false',\
-				Found				BOOL CHECK(Found IN('true','false')) DEFAULT 'false'\
+				Found				BOOL CHECK(Found IN('true','false')) DEFAULT 'false',\
+				Tries				INTEGER DEFAULT 0,\
+				Key					TEXT\
 				);");
 
 	db->Execute("CREATE UNIQUE INDEX IF NOT EXISTS idxMessageRequest ON tblMessageRequests(IdentityID,Day,RequestIndex);");