Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dbwrappers return error value fix #5281

Merged
merged 2 commits into from Aug 26, 2014
Merged

Dbwrappers return error value fix #5281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5e263d
Fix last_err value in MysqlDatabase::nextid()
maksqwe Aug 25, 2014
afac2ca
Fix last_err value in sqlitedataset.cpp
maksqwe Aug 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion xbmc/dbwrappers/mysqldataset.cpp
View file
Open in desktop
Expand Up @@ -431,7 +431,7 @@ long MysqlDatabase::nextid(const char* sname) {
CLog::Log(LOGINFO,"Next id is [%.*s] ", (int) lengths[0], row[0]);
sprintf(sqlcmd,"update %s set nextid=%d where seq_name = '%s'",seq_table,id,sname);
mysql_free_result(res);
if ((last_err = query_with_reconnect(sqlcmd) != 0)) return DB_UNEXPECTED_RESULT;
if ((last_err = query_with_reconnect(sqlcmd)) != 0) return DB_UNEXPECTED_RESULT;
return id;
}
return DB_UNEXPECTED_RESULT;
Expand Down
8 changes: 4 additions & 4 deletions xbmc/dbwrappers/sqlitedataset.cpp
View file
Open in desktop
Expand Up @@ -328,7 +328,7 @@ int SqliteDatabase::drop_analytics(void) {

for (size_t i=0; i < res.records.size(); i++) {
sprintf(sqlcmd,"DROP INDEX '%s'", res.records[i]->at(0).get_asString().c_str());
if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL) != SQLITE_OK)) return DB_UNEXPECTED_RESULT;
if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL)) != SQLITE_OK) return DB_UNEXPECTED_RESULT;
}
res.clear();

Expand All @@ -338,7 +338,7 @@ int SqliteDatabase::drop_analytics(void) {

for (size_t i=0; i < res.records.size(); i++) {
sprintf(sqlcmd,"DROP VIEW '%s'", res.records[i]->at(0).get_asString().c_str());
if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL) != SQLITE_OK)) return DB_UNEXPECTED_RESULT;
if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL)) != SQLITE_OK) return DB_UNEXPECTED_RESULT;
}
res.clear();

Expand All @@ -348,7 +348,7 @@ int SqliteDatabase::drop_analytics(void) {

for (size_t i=0; i < res.records.size(); i++) {
sprintf(sqlcmd,"DROP TRIGGER '%s'", res.records[i]->at(0).get_asString().c_str());
if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL) != SQLITE_OK)) return DB_UNEXPECTED_RESULT;
if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL)) != SQLITE_OK) return DB_UNEXPECTED_RESULT;
}
// res would be cleared on destruct

Expand Down Expand Up @@ -383,7 +383,7 @@ long SqliteDatabase::nextid(const char* sname) {
else {
id = res.records[0]->at(0).get_asInt()+1;
sprintf(sqlcmd,"update %s set nextid=%d where seq_name = '%s'",sequence_table.c_str(),id,sname);
if ((last_err = sqlite3_exec(conn,sqlcmd,NULL,NULL,NULL) != SQLITE_OK)) return DB_UNEXPECTED_RESULT;
if ((last_err = sqlite3_exec(conn,sqlcmd,NULL,NULL,NULL)) != SQLITE_OK) return DB_UNEXPECTED_RESULT;
return id;
}
return DB_UNEXPECTED_RESULT;
Expand Down