X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Flibraries%2FCalendarDataStorage%2FCalendarDataStorage.cpp;h=63c8a3ef4267db5207e5747819ac8f93c95af75e;hp=4a690b21dfe8edb2409d276642647cb44d4cb352;hb=48ebeff90fa77e8f38d67f2472fa5eee178cd765;hpb=1fe6e43892e5c572949a293a9e19704b5debadad

diff --git a/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp b/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
index 4a690b2..63c8a3e 100644
--- a/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
+++ b/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
@@ -157,6 +157,33 @@ CDSAccountResult CalendarDataStorage::AddAccount(string accountName, int account
 	int resultCode;
 	
 	sqlite3_stmt *statementHandle;
+	sqlite3_stmt *findHandle;
+	
+	if (accountName == ""){
+		return CDSACCOUNT_NONAME;
+	}
+	
+	// Check if the account name already exsits.
+
+	resultCode = sqlite3_prepare_v2(db, "SELECT name FROM accounts WHERE name=(?1);", -1, &findHandle, nullptr);
+	
+	if (resultCode != 0){
+		return CDSACCOUNT_FAILED;
+	}
+	
+	resultCode = sqlite3_bind_text(findHandle, 1, accountName.c_str(), -1, SQLITE_STATIC);
+	
+	if (resultCode != 0){
+		return CDSACCOUNT_FAILED;
+	}
+	
+	resultCode = sqlite3_step(findHandle);
+	
+	if (resultCode != SQLITE_DONE){
+		return CDSACCOUNT_FAILED;
+	} else if (resultCode == SQLITE_ROW){
+		return CDSACCOUNT_FAILED;
+	}
 	
 	resultCode = sqlite3_prepare_v2(db, "INSERT INTO accounts (name, preferencesid) VALUES(?1, ?2);", -1, &statementHandle, nullptr);
 	
@@ -316,8 +343,13 @@ CDSAccountResult CalendarDataStorage::UpdateAccount(int accountID, string accoun
 	int resultCode;
 	
 	sqlite3_stmt *findHandle;
+	sqlite3_stmt *existingHandle;
 	sqlite3_stmt *statementHandle;
 	
+	if (accountName == ""){
+		return CDSACCOUNT_NONAME;
+	}
+	
 	// Check if account exists first.
 	
 	resultCode = sqlite3_prepare_v2(db, "SELECT id from accounts WHERE id=(?1);", -1, &findHandle, nullptr);
@@ -342,6 +374,30 @@ CDSAccountResult CalendarDataStorage::UpdateAccount(int accountID, string accoun
 		return CDSACCOUNT_FAILED;
 	}
 	
+	// Check if account with the name given already exists before renaming.
+	
+	resultCode = sqlite3_prepare_v2(db, "SELECT name from accounts WHERE name=(?1);", -1, &existingHandle, nullptr);
+	
+	if (resultCode != 0){
+		return CDSACCOUNT_FAILED;
+	}
+	
+	resultCode = sqlite3_bind_text(existingHandle, 1, accountName.c_str(), -1, SQLITE_STATIC);
+	
+	if (resultCode != 0){
+		return CDSACCOUNT_FAILED;
+	}
+	
+	resultCode = sqlite3_step(existingHandle);
+	
+	if (resultCode == SQLITE_ROW){
+		return CDSACCOUNT_FAILED;
+	} else if (resultCode == SQLITE_DONE) {
+	
+	} else {
+		return CDSACCOUNT_FAILED;
+	}
+	
 	// Update the account.
 	
 	resultCode = sqlite3_prepare_v2(db, "UPDATE accounts SET name=(?1) WHERE id=(?2);", -1, &statementHandle, nullptr);
@@ -409,7 +465,7 @@ CDSAccountResult CalendarDataStorage::DeleteAccount(int accountID)
 	} else if (resultCode == SQLITE_DONE) {
 		return CDSACCOUNT_NOACCOUNT;
 	} else {
-		return CDSACCOUNT_FAILED;
+
 	}
 	
 	// Delete the account.
@@ -482,9 +538,30 @@ CDSCalendarResult CalendarDataStorage::AddCalendar(int accountID, string calenda
 
 	CDSCalendarResult addResult = CDSCALENDAR_UNITTESTFAIL;
 	int resultCode;
-	
+
+	sqlite3_stmt *findHandle;	
 	sqlite3_stmt *statementHandle;
 	
+	// Check if the account exists first.
+	
+	resultCode = sqlite3_prepare_v2(db, "SELECT id FROM accounts WHERE id=(?1);", -1, &findHandle, nullptr);
+	
+	if (resultCode != 0){
+		return CDSCALENDAR_FAILED;
+	}	
+
+	resultCode = sqlite3_bind_int(findHandle, 1, accountID);
+
+	if (resultCode != 0){
+		return CDSCALENDAR_FAILED;
+	}
+	
+	resultCode = sqlite3_step(findHandle);
+	
+	if (resultCode != SQLITE_DONE){
+		return CDSCALENDAR_NOACCOUNT;
+	}	
+	
 	resultCode = sqlite3_prepare_v2(db, "INSERT INTO calendars (name, calendarid, accountid, colour, description) VALUES(?1, ?2, ?3, ?4, ?5);", -1, &statementHandle, nullptr);
 	
 	if (resultCode != 0){