funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 17:58:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for mamelist import SQL statement.

Browse Source 
The prepared statement for inserting games from a mamelist XML file had a
mismatch between the number of fields and the number of value placeholders. In
tracking this down, some error handling code was added to the relevant sqlite
API calls as well.
This commit is contained in:
Levi Pearson 2017-01-24 02:00:02 -07:00
parent 60d474d87e
commit a73e310f03
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
RetroFE/Source/Database/MetadataDatabase.cpp
View File

@ -499,7 +499,12 @@ bool MetadataDatabase::importMamelist(std::string filename, std::string collecti
return false; return false;
} }
sqlite3_exec(handle, "BEGIN IMMEDIATE TRANSACTION;", NULL, NULL, &error); if(sqlite3_exec(handle, "BEGIN IMMEDIATE TRANSACTION;", NULL, NULL, &error) != SQLITE_OK)
{
std::string emsg = error;
Logger::write(Logger::ZONE_ERROR, "Metadata", "SQL Error starting transaction: " + emsg);
return false;
};
std::string gameNodeName = "game"; std::string gameNodeName = "game";
// support new mame formats // support new mame formats
@ -549,7 +554,7 @@ bool MetadataDatabase::importMamelist(std::string filename, std::string collecti
sqlite3_stmt *stmt; sqlite3_stmt *stmt;
sqlite3_prepare_v2(handle, sqlite3_prepare_v2(handle,
"INSERT OR REPLACE INTO Meta (name, title, year, manufacturer, genre, players, buttons, cloneOf, collectionName) VALUES (?,?,?,?,?,?,?,?,?,?)", "INSERT OR REPLACE INTO Meta (name, title, year, manufacturer, genre, players, buttons, cloneOf, collectionName) VALUES (?,?,?,?,?,?,?,?,?)",
-1, &stmt, 0); -1, &stmt, 0);
@ -563,13 +568,24 @@ bool MetadataDatabase::importMamelist(std::string filename, std::string collecti
sqlite3_bind_text(stmt, 8, cloneOf.c_str(), -1, SQLITE_TRANSIENT); sqlite3_bind_text(stmt, 8, cloneOf.c_str(), -1, SQLITE_TRANSIENT);
sqlite3_bind_text(stmt, 9, collectionName.c_str(), -1, SQLITE_TRANSIENT); sqlite3_bind_text(stmt, 9, collectionName.c_str(), -1, SQLITE_TRANSIENT);
sqlite3_step(stmt); if (int code = sqlite3_step(stmt) != SQLITE_DONE)
{
std::stringstream ss;
ss << "Failed to insert machine \"" << name << "\" into database; " << sqlite3_errstr(code) << "; " << sqlite3_errmsg(handle);
Logger::write(Logger::ZONE_ERROR, "Metadata", ss.str());
sqlite3_finalize(stmt);
break;
};
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
} }
} }
config_.setProperty("status", "Saving data from \"" + filename + "\" to database"); config_.setProperty("status", "Saving data from \"" + filename + "\" to database");
sqlite3_exec(handle, "COMMIT TRANSACTION;", NULL, NULL, &error); if (sqlite3_exec(handle, "COMMIT TRANSACTION;", NULL, NULL, &error) != SQLITE_OK)
{
std::string emsg = error;
Logger::write(Logger::ZONE_ERROR, "Metadata", "SQL Error closing transaction: " + emsg);
};
return true; return true;
} }