Changeset 70219 in webkit

Timestamp:

Oct 21, 2010 2:53:02 AM (14 years ago)

Author:

evan@chromium.org

Message:

2010-10-21 Evan Martin <​evan@chromium.org>

Reviewed by Tony Chang.

sqlite: show extended error codes in error logs
​https://bugs.webkit.org/show_bug.cgi?id=47859

SQLite can provide "extended" error codes, where extra information
about the error is potentially encoded in the high bits of the error
code. It's only off by default in case older apps rely on equality
testing on the older error codes, which WebKit doesn't do.

• platform/sql/SQLiteDatabase.cpp: (WebCore::SQLiteDatabase::open):
• platform/sql/SQLiteStatement.cpp: (WebCore::SQLiteStatement::step):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/sql/SQLiteDatabase.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-21  Evan Martin  <evan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        sqlite: show extended error codes in error logs
+        https://bugs.webkit.org/show_bug.cgi?id=47859
+
+        SQLite can provide "extended" error codes, where extra information
+        about the error is potentially encoded in the high bits of the error
+        code.  It's only off by default in case older apps rely on equality
+        testing on the older error codes, which WebKit doesn't do.
+
+        * platform/sql/SQLiteDatabase.cpp:
+        (WebCore::SQLiteDatabase::open):
+        * platform/sql/SQLiteStatement.cpp:
+        (WebCore::SQLiteStatement::step):
+
 2010-10-21  Yuta Kitamura  <yutak@chromium.org>
 

trunk/WebCore/platform/sql/SQLiteDatabase.cpp

@@ -69 +69 @@
         LOG_ERROR("SQLite database failed to load from %s\nCause - %s", filename.ascii().data(),
             sqlite3_errmsg(m_db));
+        sqlite3_close(m_db);
+        m_db = 0;
+        return false;
+    }
+    if (sqlite3_extended_result_codes(m_db, 1) != SQLITE_OK) {
+        LOG_ERROR("SQLite database error when enabling extended errors - %s", sqlite3_errmsg(m_db));
         sqlite3_close(m_db);
         m_db = 0;