X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fdbsetup.cpp;h=644310be2d421f50d50887b2c7b992b67d9eb0a3;hp=e7634692eb95f49cfb0052833a5da3ba1a26edf9;hb=ed0732b2550c23c05fc9faf925620e87ee6dee12;hpb=59a5414ec47a2932a7802fcd1d98c4d80166564f

diff --git a/src/dbsetup.cpp b/src/dbsetup.cpp
index e763469..644310b 100644
--- a/src/dbsetup.cpp
+++ b/src/dbsetup.cpp
@@ -111,13 +111,19 @@ void SetupDB(SQLite3DB::DB *db)
 			major=1;
 			minor=15;
 		}
+		if(major==1 && minor==15)
+		{
+			ConvertDB0115To0116(db);
+			major=1;
+			minor=16;
+		}
 	}
 	else
 	{
-		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,15);");
+		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,16);");
 	}
 
-	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=15;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=16;");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblFMSVersion(\
 				Major				INTEGER,\
@@ -218,7 +224,8 @@ void SetupDB(SQLite3DB::DB *db)
 				PeerTrustListTrust		INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
 				AddedMethod				TEXT,\
 				Hidden					BOOL CHECK(Hidden IN('true','false')) DEFAULT 'false',\
-				PurgeDate				DATETIME\
+				PurgeDate				DATETIME,\
+				FailureCount			INTEGER CHECK(FailureCount>=0) DEFAULT 0\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentityRequests(\
@@ -353,7 +360,8 @@ void SetupDB(SQLite3DB::DB *db)
 				FromMessageList		BOOL CHECK(FromMessageList IN('true','false')) DEFAULT 'false',\
 				Found				BOOL CHECK(Found IN('true','false')) DEFAULT 'false',\
 				Tries				INTEGER DEFAULT 0,\
-				Key					TEXT\
+				Key					TEXT,\
+				FromIdentityID		INTEGER\
 				);");
 
 	db->Execute("CREATE UNIQUE INDEX IF NOT EXISTS idxMessageRequest ON tblMessageRequests(IdentityID,Day,RequestIndex);");