mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 384526 - Use sqlite3_prepare_v2 instead of sqlite3_prepare. r=sspitzer

This commit is contained in:
sdwilsh%shawnwilsher.com 2007-07-11 22:20:40 +00:00
Родитель 476d84b9c3
Коммит 3147e0c494
4 изменённых файлов: 41 добавлений и 69 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
storage/src/mozStorage.h
Просмотреть файл

@ -77,6 +77,8 @@ ConvertResultCode(int srv)
return NS_ERROR_OUT_OF_MEMORY;
case SQLITE_MISUSE:
return NS_ERROR_UNEXPECTED;
case SQLITE_ABORT:
return NS_ERROR_ABORT;
}
// generic error

18
storage/src/mozStorageConnection.cpp
Просмотреть файл

@ -140,7 +140,7 @@ mozStorageConnection::Initialize(nsIFile *aDatabaseFile)
*/
sqlite3_stmt *stmt = nsnull;
nsCString query("SELECT * FROM sqlite_master");
srv = sqlite3_prepare (mDBConn, query.get(), query.Length(), &stmt, nsnull);
srv = sqlite3_prepare_v2(mDBConn, query.get(), query.Length(), &stmt, NULL);
if (srv == SQLITE_OK) {
srv = sqlite3_step(stmt);
@ -304,7 +304,8 @@ mozStorageConnection::TableExists(const nsACString& aSQLStatement, PRBool *_retv
query.AppendLiteral("'");
sqlite3_stmt *stmt = nsnull;
int srv = sqlite3_prepare (mDBConn, query.get(), query.Length(), &stmt, nsnull);
int srv = sqlite3_prepare_v2(mDBConn, query.get(), query.Length(), &stmt,
NULL);
if (srv != SQLITE_OK) {
HandleSqliteError(query.get());
return ConvertResultCode(srv);
@ -320,9 +321,9 @@ mozStorageConnection::TableExists(const nsACString& aSQLStatement, PRBool *_retv
exists = PR_TRUE;
} else if (srv == SQLITE_DONE) {
exists = PR_FALSE;
} else if (srv == SQLITE_ERROR) {
} else {
HandleSqliteError("TableExists finalize");
return NS_ERROR_FAILURE;
return ConvertResultCode(srv);
}
*_retval = exists;
@ -339,7 +340,8 @@ mozStorageConnection::IndexExists(const nsACString& aIndexName, PRBool* _retval)
query.AppendLiteral("'");
sqlite3_stmt *stmt = nsnull;
int srv = sqlite3_prepare(mDBConn, query.get(), query.Length(), &stmt, nsnull);
int srv = sqlite3_prepare_v2(mDBConn, query.get(), query.Length(), &stmt,
NULL);
if (srv != SQLITE_OK) {
HandleSqliteError(query.get());
return ConvertResultCode(srv);
@ -348,14 +350,10 @@ mozStorageConnection::IndexExists(const nsACString& aIndexName, PRBool* _retval)
*_retval = PR_FALSE;
srv = sqlite3_step(stmt);
// we just care about the return value from step
sqlite3_finalize(stmt);
(void)sqlite3_finalize(stmt);
if (srv == SQLITE_ROW) {
*_retval = PR_TRUE;
} else if (srv == SQLITE_ERROR) {
HandleSqliteError("IndexExists finalize");
return NS_ERROR_FAILURE;
}
return ConvertResultCode(srv);

86
storage/src/mozStorageStatement.cpp
Просмотреть файл

@ -117,7 +117,8 @@ mozStorageStatement::Initialize(mozIStorageConnection *aDBConnection, const nsAC
int nRetries = 0;
while (nRetries < 2) {
srv = sqlite3_prepare (db, nsPromiseFlatCString(aSQLStatement).get(), aSQLStatement.Length(), &mDBStatement, NULL);
srv = sqlite3_prepare_v2(db, nsPromiseFlatCString(aSQLStatement).get(),
aSQLStatement.Length(), &mDBStatement, NULL);
if ((srv == SQLITE_SCHEMA && nRetries != 0) ||
(srv != SQLITE_SCHEMA && srv != SQLITE_OK))
{
@ -412,68 +413,39 @@ mozStorageStatement::ExecuteStep(PRBool *_retval)
}
}
int nRetries = 0;
while (nRetries < 2) {
int srv = sqlite3_step (mDBStatement);
int srv = sqlite3_step (mDBStatement);
#ifdef PR_LOGGING
if (srv != SQLITE_ROW && srv != SQLITE_DONE)
{
nsCAutoString errStr;
mDBConnection->GetLastErrorString(errStr);
PR_LOG(gStorageLog, PR_LOG_DEBUG, ("mozStorageStatement::ExecuteStep error: %s", errStr.get()));
}
if (srv != SQLITE_ROW && srv != SQLITE_DONE)
{
nsCAutoString errStr;
mDBConnection->GetLastErrorString(errStr);
PR_LOG(gStorageLog, PR_LOG_DEBUG, ("mozStorageStatement::ExecuteStep error: %s", errStr.get()));
}
#endif
// SQLITE_ROW and SQLITE_DONE are non-errors
if (srv == SQLITE_ROW) {
// we got a row back
mExecuting = PR_TRUE;
*_retval = PR_TRUE;
return NS_OK;
} else if (srv == SQLITE_DONE) {
// statement is done (no row returned)
mExecuting = PR_FALSE;
*_retval = PR_FALSE;
return NS_OK;
} else if (srv == SQLITE_BUSY ||
srv == SQLITE_MISUSE)
{
mExecuting = PR_FALSE;
return NS_ERROR_FAILURE;
} else if (srv == SQLITE_SCHEMA) {
// step should never return SQLITE_SCHEMA
NS_NOTREACHED("sqlite3_step returned SQLITE_SCHEMA!");
return NS_ERROR_FAILURE;
} else if (srv == SQLITE_ERROR) {
// so we may end up with a SQLITE_ERROR/SQLITE_SCHEMA only after
// we reset, because SQLite's error reporting story
// sucks.
if (mExecuting == PR_TRUE) {
PR_LOG(gStorageLog, PR_LOG_ERROR, ("SQLITE_ERROR after mExecuting was true!"));
mExecuting = PR_FALSE;
return NS_ERROR_FAILURE;
}
srv = sqlite3_reset(mDBStatement);
if (srv == SQLITE_SCHEMA) {
rv = Recreate();
NS_ENSURE_SUCCESS(rv, rv);
nRetries++;
} else {
return NS_ERROR_FAILURE;
}
} else {
// something that shouldn't happen happened
NS_ERROR ("sqlite3_step returned an error code we don't know about!");
}
// SQLITE_ROW and SQLITE_DONE are non-errors
if (srv == SQLITE_ROW) {
// we got a row back
mExecuting = PR_TRUE;
*_retval = PR_TRUE;
return NS_OK;
} else if (srv == SQLITE_DONE) {
// statement is done (no row returned)
mExecuting = PR_FALSE;
*_retval = PR_FALSE;
return NS_OK;
} else if (srv == SQLITE_BUSY || srv == SQLITE_MISUSE) {
mExecuting = PR_FALSE;
return NS_ERROR_FAILURE;
} else if (mExecuting == PR_TRUE) {
#ifdef PR_LOGGING
PR_LOG(gStorageLog, PR_LOG_ERROR, ("SQLite error after mExecuting was true!"));
#endif
mExecuting = PR_FALSE;
}
// shouldn't get here
return NS_ERROR_FAILURE;
return ConvertResultCode(srv);
}
/* [noscript,notxpcom] sqlite3stmtptr getNativeStatementPointer(); */

4
storage/test/unit/test_storage_progresshandler.js
Просмотреть файл

@ -106,9 +106,9 @@ function test_handler_abort()
while(stmt.executeStep());
do_throw("We shouldn't get here!");
} catch (e) {
do_check_eq(Cr.NS_ERROR_FAILURE, e.result);
do_check_eq(Cr.NS_ERROR_ABORT, e.result);
// Magic value: callback abort
do_check_eq(msc.lastError, 4);
//do_check_eq(msc.lastError, 4); XXX see Bug 387609
}
}