Changeset 158906 in webkit

Timestamp:

Nov 7, 2013 10:08:41 PM (10 years ago)

Author:

beidson@apple.com

Message:

Enhance SQL journal_mode setting code to be less likely to log an error.
<rdar://problem/15418577> and ​https://bugs.webkit.org/show_bug.cgi?id=124018

Reviewed by Anders Carlsson.

Even though the docs says SQLITE_ROW will always be returned, apparently SQLITE_OK is sometimes returned.
Change the code to handle that.

• platform/sql/SQLiteDatabase.cpp:

(WebCore::SQLiteDatabase::open): Save the statement result value, and accept SQLITE_OK as a non-error condition.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-07  Brady Eidson  <beidson@apple.com>
+
+        Enhance SQL journal_mode setting code to be less likely to log an error.
+        <rdar://problem/15418577> and https://bugs.webkit.org/show_bug.cgi?id=124018
+
+        Reviewed by Anders Carlsson.
+
+        Even though the docs says SQLITE_ROW will always be returned, apparently SQLITE_OK is sometimes returned.
+        Change the code to handle that.
+
+        * platform/sql/SQLiteDatabase.cpp:
+        (WebCore::SQLiteDatabase::open): Save the statement result value, and accept SQLITE_OK as a non-error condition.
+
 2013-11-07  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp

@@ -100 +100 @@
 
     SQLiteStatement walStatement(*this, ASCIILiteral("PRAGMA journal_mode=WAL;"));
-    if (walStatement.step() != SQLITE_ROW)
+    int result = walStatement.step();
+    if (result != SQLITE_OK && result != SQLITE_ROW)
         LOG_ERROR("SQLite database failed to set journal_mode to WAL, error: %s",  lastErrorMsg());
 
 #ifndef NDEBUG
-    String mode = walStatement.getColumnText(0);
-    if (!equalIgnoringCase(mode, "wal"))
-        LOG_ERROR("journal_mode of database should be 'wal', but is '%s'", mode.utf8().data());
+    if (result == SQLITE_ROW) {
+        String mode = walStatement.getColumnText(0);
+        if (!equalIgnoringCase(mode, "wal"))
+            LOG_ERROR("journal_mode of database should be 'wal', but is '%s'", mode.utf8().data());
+    }
 #endif