Unifiy lastError message fetching and do not set last error message i…

…f nothing SQLite specific went wrong.
doo · Mar 22, 2013 · 60b1f72 · 60b1f72
1 parent 02431a6
commit 60b1f72
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/SQLite3Component/Database.cpp b/SQLite3Component/Database.cpp
@@ -91,6 +91,11 @@ namespace SQLite3 {
   bool Database::sharedCache = false;
 
   IAsyncOperation<Database^>^ Database::OpenAsync(Platform::String^ dbPath) {
+    if (!dbPath->Length()) {
+      throw ref new Platform::COMException(E_INVALIDARG, L"You must specify a path or :memory:");
+    }
+
+    // Need to remember the current thread for later callbacks into JS
     CoreDispatcher^ dispatcher = CoreWindow::GetForCurrentThread()->Dispatcher;
 
     return Concurrency::create_async([dbPath, dispatcher]() {
@@ -222,7 +227,7 @@ namespace SQLite3 {
         statement->Run();
         return sqlite3_changes(sqlite);
       } catch (Platform::Exception^ e) {
-        lastErrorMsg = (WCHAR*)sqlite3_errmsg16(sqlite);
+        saveLastErrorMessage();
         throw;
       }
     });
@@ -243,7 +248,7 @@ namespace SQLite3 {
         StatementPtr statement = PrepareAndBind(sql, params);
         return statement->One();
       } catch (Platform::Exception^ e) {
-        lastErrorMsg = (WCHAR*)sqlite3_errmsg16(sqlite);
+        saveLastErrorMessage();
         throw;
       }
     });
@@ -264,7 +269,7 @@ namespace SQLite3 {
         StatementPtr statement = PrepareAndBind(sql, params);
         return statement->All();
       } catch (Platform::Exception^ e) {
-        lastErrorMsg = (WCHAR*)sqlite3_errmsg16(sqlite);
+        saveLastErrorMessage();
         throw;
       }
     });
@@ -285,7 +290,7 @@ namespace SQLite3 {
         StatementPtr statement = PrepareAndBind(sql, params);
         statement->Each(callback, dispatcher);
       } catch (Platform::Exception^ e) {
-        lastErrorMsg = (WCHAR*)sqlite3_errmsg16(sqlite);
+        saveLastErrorMessage();
         throw;
       }
     });
@@ -297,4 +302,12 @@ namespace SQLite3 {
     statement->Bind(params);
     return statement;
   }
+
+  void Database::saveLastErrorMessage() {
+    if (sqlite3_errcode(sqlite) != SQLITE_OK) {
+      lastErrorMessage = (WCHAR*)sqlite3_errmsg16(sqlite);
+    } else {
+      lastErrorMessage.clear();
+    }        
+  }
 }
diff --git a/SQLite3Component/Database.h b/SQLite3Component/Database.h
@@ -43,7 +43,7 @@ namespace SQLite3 {
 
     property Platform::String^ LastError {
       Platform::String^ get() {
-        return ref new Platform::String(lastErrorMsg.c_str());
+        return ref new Platform::String(lastErrorMessage.c_str());
       };
     }
 
@@ -136,7 +136,9 @@ namespace SQLite3 {
     Platform::String^ collationLanguage;
     Windows::UI::Core::CoreDispatcher^ dispatcher;
     sqlite3* sqlite;
-    std::wstring lastErrorMsg;
+    std::wstring lastErrorMessage;
+
+    void saveLastErrorMessage();
 
     event ChangeHandler^ _Insert;
     int insertChangeHandlers;