| Index: Source/WebCore/platform/sql/SQLiteStatement.cpp
|
| diff --git a/Source/WebCore/platform/sql/SQLiteStatement.cpp b/Source/WebCore/platform/sql/SQLiteStatement.cpp
|
| index 3c7e949b86daa4eebad0eeb8e925c52bd243c626..acf254f4cad2e8bceff7c5e8ffe0c34d206d01c4 100644
|
| --- a/Source/WebCore/platform/sql/SQLiteStatement.cpp
|
| +++ b/Source/WebCore/platform/sql/SQLiteStatement.cpp
|
| @@ -68,7 +68,7 @@ int SQLiteStatement::prepare()
|
| return SQLITE_INTERRUPT;
|
|
|
| const void* tail = 0;
|
| - LOG(SQLDatabase, "SQL - prepare - %s", m_query.ascii().data());
|
| + LOG_INFO(SQLDatabase, "SQL - prepare - %s", m_query.ascii().data());
|
| String strippedQuery = m_query.stripWhiteSpace();
|
| const UChar* nullTermed = strippedQuery.charactersWithNullTermination();
|
| int error = sqlite3_prepare16_v2(m_database.sqlite3Handle(), nullTermed, -1, &m_statement, &tail);
|
| @@ -82,7 +82,7 @@ int SQLiteStatement::prepare()
|
| }
|
|
|
| if (error != SQLITE_OK)
|
| - LOG(SQLDatabase, "sqlite3_prepare16 failed (%i)\n%s\n%s", error, m_query.ascii().data(), sqlite3_errmsg(m_database.sqlite3Handle()));
|
| + LOG_INFO(SQLDatabase, "sqlite3_prepare16 failed (%i)\n%s\n%s", error, m_query.ascii().data(), sqlite3_errmsg(m_database.sqlite3Handle()));
|
| const UChar* ch = static_cast<const UChar*>(tail);
|
| if (ch && *ch)
|
| error = SQLITE_ERROR;
|
| @@ -106,11 +106,11 @@ int SQLiteStatement::step()
|
| // in order to compute properly the lastChanges() return value.
|
| m_database.updateLastChangesCount();
|
|
|
| - LOG(SQLDatabase, "SQL - step - %s", m_query.ascii().data());
|
| + LOG_INFO(SQLDatabase, "SQL - step - %s", m_query.ascii().data());
|
| int error = sqlite3_step(m_statement);
|
| if (error != SQLITE_DONE && error != SQLITE_ROW) {
|
| - LOG(SQLDatabase, "sqlite3_step failed (%i)\nQuery - %s\nError - %s",
|
| - error, m_query.ascii().data(), sqlite3_errmsg(m_database.sqlite3Handle()));
|
| + LOG_INFO(SQLDatabase, "sqlite3_step failed (%i)\nQuery - %s\nError - %s",
|
| + error, m_query.ascii().data(), sqlite3_errmsg(m_database.sqlite3Handle()));
|
| }
|
|
|
| return error;
|
| @@ -123,7 +123,7 @@ int SQLiteStatement::finalize()
|
| #endif
|
| if (!m_statement)
|
| return SQLITE_OK;
|
| - LOG(SQLDatabase, "SQL - finalize - %s", m_query.ascii().data());
|
| + LOG_INFO(SQLDatabase, "SQL - finalize - %s", m_query.ascii().data());
|
| int result = sqlite3_finalize(m_statement);
|
| m_statement = 0;
|
| return result;
|
| @@ -134,7 +134,7 @@ int SQLiteStatement::reset()
|
| ASSERT(m_isPrepared);
|
| if (!m_statement)
|
| return SQLITE_OK;
|
| - LOG(SQLDatabase, "SQL - reset - %s", m_query.ascii().data());
|
| + LOG_INFO(SQLDatabase, "SQL - reset - %s", m_query.ascii().data());
|
| return sqlite3_reset(m_statement);
|
| }
|
|
|
| @@ -439,13 +439,13 @@ const void* SQLiteStatement::getColumnBlob(int col, int& size)
|
| size = 0;
|
|
|
| if (finalize() != SQLITE_OK)
|
| - LOG(SQLDatabase, "Finalize failed");
|
| + LOG_INFO(SQLDatabase, "Finalize failed");
|
| if (prepare() != SQLITE_OK) {
|
| - LOG(SQLDatabase, "Prepare failed");
|
| + LOG_INFO(SQLDatabase, "Prepare failed");
|
| return 0;
|
| }
|
| if (step() != SQLITE_ROW) {
|
| - LOG(SQLDatabase, "Step wasn't a row");
|
| + LOG_INFO(SQLDatabase, "Step wasn't a row");
|
| return 0;
|
| }
|
|
|
| @@ -476,7 +476,7 @@ bool SQLiteStatement::returnTextResults(int col, Vector<String>& v)
|
| bool result = true;
|
| if (m_database.lastError() != SQLITE_DONE) {
|
| result = false;
|
| - LOG(SQLDatabase, "Error reading results from database query %s", m_query.ascii().data());
|
| + LOG_INFO(SQLDatabase, "Error reading results from database query %s", m_query.ascii().data());
|
| }
|
| finalize();
|
| return result;
|
| @@ -496,7 +496,7 @@ bool SQLiteStatement::returnIntResults(int col, Vector<int>& v)
|
| bool result = true;
|
| if (m_database.lastError() != SQLITE_DONE) {
|
| result = false;
|
| - LOG(SQLDatabase, "Error reading results from database query %s", m_query.ascii().data());
|
| + LOG_INFO(SQLDatabase, "Error reading results from database query %s", m_query.ascii().data());
|
| }
|
| finalize();
|
| return result;
|
| @@ -516,7 +516,7 @@ bool SQLiteStatement::returnInt64Results(int col, Vector<int64_t>& v)
|
| bool result = true;
|
| if (m_database.lastError() != SQLITE_DONE) {
|
| result = false;
|
| - LOG(SQLDatabase, "Error reading results from database query %s", m_query.ascii().data());
|
| + LOG_INFO(SQLDatabase, "Error reading results from database query %s", m_query.ascii().data());
|
| }
|
| finalize();
|
| return result;
|
| @@ -536,7 +536,7 @@ bool SQLiteStatement::returnDoubleResults(int col, Vector<double>& v)
|
| bool result = true;
|
| if (m_database.lastError() != SQLITE_DONE) {
|
| result = false;
|
| - LOG(SQLDatabase, "Error reading results from database query %s", m_query.ascii().data());
|
| + LOG_INFO(SQLDatabase, "Error reading results from database query %s", m_query.ascii().data());
|
| }
|
| finalize();
|
| return result;
|
|
|