1 files changed, 42 insertions, 0 deletions

@@ -1,7 +1,9 @@
 #include "database.h"
 #include <sqlite3.h>
 #include <stdexcept>
+#include <sstream>
 #include "query.h"
+#include "version.h"
 
 namespace verbly {
 
@@ -17,6 +19,35 @@ namespace verbly {
 
       throw database_error("Could not open verbly datafile", errmsg);
     }
+
+    std::string queryString = "SELECT major, minor FROM version";
+
+    sqlite3_stmt* ppstmt;
+    if (sqlite3_prepare_v2(ppdb_, queryString.c_str(), queryString.length(), &ppstmt, NULL) != SQLITE_OK)
+    {
+      std::string errorMsg = sqlite3_errmsg(ppdb_);
+      sqlite3_finalize(ppstmt);
+
+      throw database_error("Error reading database version", errorMsg);
+    }
+
+    if (sqlite3_step(ppstmt) != SQLITE_ROW)
+    {
+      std::string errorMsg = sqlite3_errmsg(ppdb_);
+      sqlite3_finalize(ppstmt);
+
+      throw database_error("Error reading database version", errorMsg);
+    }
+
+    major_ = sqlite3_column_int(ppstmt, 0);
+    minor_ = sqlite3_column_int(ppstmt, 1);
+
+    sqlite3_finalize(ppstmt);
+
+    if (major_ != DATABASE_MAJOR_VERSION)
+    {
+      throw database_version_mismatch(DATABASE_MAJOR_VERSION, major_);
+    }
   }
 
   database::database(database&& other) : database()
@@ -135,4 +166,15 @@ namespace verbly {
     return result;
   }
 
+  std::string database_version_mismatch::generateMessage(int right, int wrong)
+  {
+    std::ostringstream msgbuilder;
+    msgbuilder << "Incompatible database version: needed ";
+    msgbuilder << right;
+    msgbuilder << ", found ";
+    msgbuilder << wrong;
+
+    return msgbuilder.str();
+  }
+
 };