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