X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fglobal.cpp;h=087ce1cc304cd7024c41e7006d1b324024b5f662;hp=0698703e317a621729bfc2a6724016224ca7ed21;hb=175f098e7e712b839db433b93fe8649a402c6784;hpb=1dee4e3cd008a27789bbce05b0eb47b0eb5d121a

diff --git a/src/global.cpp b/src/global.cpp
index 0698703..087ce1c 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -28,9 +28,6 @@ void SetupDB()
 	db->Open("fms.db3");
 	db->SetBusyTimeout(10000);		// set timeout to 10 seconds
 	db->Execute("VACUUM;");
-	
-	// TODO remove this - temp fix for problem in 0.1.8
-	db->Execute("DELETE FROM tblMessageBoard WHERE MessageID NOT IN (SELECT MessageID FROM tblMessage);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblDBVersion(\
 				Major				INTEGER,\
@@ -64,10 +61,16 @@ void SetupDB()
 			major=1;
 			minor=4;
 		}
+		if(major==1 && minor==4)
+		{
+			ConvertDB0104To0105();
+			major=1;
+			minor=5;
+		}
 	}
 	else
 	{
-		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,4);");
+		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,5);");
 	}
 
 	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=4;");
@@ -131,18 +134,21 @@ void SetupDB()
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentity(\
-				IdentityID			INTEGER PRIMARY KEY,\
-				PublicKey			TEXT UNIQUE,\
-				Name				TEXT,\
-				SingleUse			BOOL CHECK(SingleUse IN('true','false')) DEFAULT 'false',\
-				PublishTrustList	BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\
-				PublishBoardList	BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\
-				DateAdded			DATETIME,\
-				LastSeen			DATETIME,\
-				LocalMessageTrust	INTEGER CHECK(LocalMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
-				PeerMessageTrust	INTEGER CHECK(PeerMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
-				LocalTrustListTrust	INTEGER CHECK(LocalTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
-				PeerTrustListTrust	INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL\
+				IdentityID				INTEGER PRIMARY KEY,\
+				PublicKey				TEXT UNIQUE,\
+				Name					TEXT,\
+				SingleUse				BOOL CHECK(SingleUse IN('true','false')) DEFAULT 'false',\
+				PublishTrustList		BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\
+				PublishBoardList		BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\
+				DateAdded				DATETIME,\
+				LastSeen				DATETIME,\
+				LocalMessageTrust		INTEGER CHECK(LocalMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				PeerMessageTrust		INTEGER CHECK(PeerMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				LocalTrustListTrust		INTEGER CHECK(LocalTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				PeerTrustListTrust		INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				AddedMethod				TEXT,\
+				MessageTrustComment		TEXT,\
+				TrustListTrustComment	TEXT\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentityRequests(\
@@ -172,10 +178,12 @@ void SetupDB()
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblPeerTrust(\
-				IdentityID			INTEGER,\
-				TargetIdentityID	INTEGER,\
-				MessageTrust		INTEGER CHECK(MessageTrust BETWEEN 0 AND 100),\
-				TrustListTrust		INTEGER CHECK(TrustListTrust BETWEEN 0 AND 100)\
+				IdentityID				INTEGER,\
+				TargetIdentityID		INTEGER,\
+				MessageTrust			INTEGER CHECK(MessageTrust BETWEEN 0 AND 100),\
+				TrustListTrust			INTEGER CHECK(TrustListTrust BETWEEN 0 AND 100),\
+				MessageTrustComment		TEXT,\
+				TrustListTrustComment	TEXT\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblBoard(\
@@ -463,6 +471,19 @@ void ConvertDB0103To0104()
 	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=4;");
 }
 
+void ConvertDB0104To0105()
+{
+	// add AddedMethod, MessageTrustComment, TrustListTrustComment to tblIdentity
+	// add MessageTrustComment,TrustListTrustComment to tblPeerTrust
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("ALTER TABLE tblIdentity ADD COLUMN AddedMethod TEXT;");
+	db->Execute("ALTER TABLE tblIdentity ADD COLUMN MessageTrustComment TEXT;");
+	db->Execute("ALTER TABLE tblIdentity ADD COLUMN TrustListTrustComment TEXT;");
+	db->Execute("ALTER TABLE tblPeerTrust ADD COLUMN MessageTrustComment TEXT;");
+	db->Execute("ALTER TABLE tblPeerTrust ADD COLUMN TrustListTrustComment TEXT;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=5;");
+}
+
 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