Index: src/libchcore/TSQLiteTaskManagerSchema.cpp =================================================================== diff -u -N -ra99c8baeb8f6c237603df46c0f5c4cf943152c09 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 --- src/libchcore/TSQLiteTaskManagerSchema.cpp (.../TSQLiteTaskManagerSchema.cpp) (revision a99c8baeb8f6c237603df46c0f5c4cf943152c09) +++ src/libchcore/TSQLiteTaskManagerSchema.cpp (.../TSQLiteTaskManagerSchema.cpp) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) @@ -22,48 +22,47 @@ #include "TSerializerVersion.h" #include "TSQLiteStatement.h" -BEGIN_CHCORE_NAMESPACE +namespace chcore +{ + using namespace sqlite; -using namespace sqlite; + TSQLiteTaskManagerSchema::TSQLiteTaskManagerSchema() + { + } -TSQLiteTaskManagerSchema::TSQLiteTaskManagerSchema() -{ -} + TSQLiteTaskManagerSchema::~TSQLiteTaskManagerSchema() + { + } -TSQLiteTaskManagerSchema::~TSQLiteTaskManagerSchema() -{ -} + void TSQLiteTaskManagerSchema::Setup(const sqlite::TSQLiteDatabasePtr& spDatabase) + { + TSQLiteTransaction tTransaction(spDatabase); -void TSQLiteTaskManagerSchema::Setup(const sqlite::TSQLiteDatabasePtr& spDatabase) -{ - TSQLiteTransaction tTransaction(spDatabase); + // check version of the database + TSerializerVersion tVersion(spDatabase); - // check version of the database - TSerializerVersion tVersion(spDatabase); + // if version is 0, then this is the fresh database with (almost) no tables inside + if (tVersion.GetVersion() == 0) + { + TSQLiteStatement tStatement(spDatabase); - // if version is 0, then this is the fresh database with (almost) no tables inside - if(tVersion.GetVersion() == 0) - { - TSQLiteStatement tStatement(spDatabase); + tStatement.Prepare(_T("CREATE TABLE tasks(id BIGINT UNIQUE PRIMARY KEY, task_order INT NOT NULL, path VARCHAR(32768) NOT NULL)")); + tStatement.Step(); - tStatement.Prepare(_T("CREATE TABLE tasks(id BIGINT UNIQUE PRIMARY KEY, task_order INT NOT NULL, path VARCHAR(32768) NOT NULL)")); - tStatement.Step(); + // and finally set the database version to current one + tVersion.SetVersion(1); + } + if (tVersion.GetVersion() == 1) + { + TSQLiteStatement tStatement(spDatabase); - // and finally set the database version to current one - tVersion.SetVersion(1); - } - if(tVersion.GetVersion() == 1) - { - TSQLiteStatement tStatement(spDatabase); + tStatement.Prepare(_T("CREATE TABLE obsolete_tasks(id BIGINT UNIQUE PRIMARY KEY, path VARCHAR(32768) NOT NULL)")); + tStatement.Step(); - tStatement.Prepare(_T("CREATE TABLE obsolete_tasks(id BIGINT UNIQUE PRIMARY KEY, path VARCHAR(32768) NOT NULL)")); - tStatement.Step(); + // and finally set the database version to current one + tVersion.SetVersion(2); + } - // and finally set the database version to current one - tVersion.SetVersion(2); + tTransaction.Commit(); } - - tTransaction.Commit(); } - -END_CHCORE_NAMESPACE