[webkit-changes] [197980] trunk/Source/WebCore

[ryanhaddad]

Title: [197980] trunk/Source/WebCore

Revision

197980

Author

ryanhad...@apple.com

Date

2016-03-10 17:46:31 -0800 (Thu, 10 Mar 2016)

Log Message

Unreviewed, rolling out r197922.
https://bugs.webkit.org/show_bug.cgi?id=155340

This change broke storage/websql tests on ios-simulator.
(Requested by ryanhaddad on #webkit).

Reverted changeset:

"WebKit should adopt journal_mode=wal for all SQLite
databases."
https://bugs.webkit.org/show_bug.cgi?id=133496
http://trac.webkit.org/changeset/197922

Patch by Commit Queue <commit-qu...@webkit.org> on 2016-03-10

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp
• trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (197979 => 197980)

--- trunk/Source/WebCore/ChangeLog	2016-03-11 01:41:12 UTC (rev 197979)
+++ trunk/Source/WebCore/ChangeLog	2016-03-11 01:46:31 UTC (rev 197980)
@@ -1,3 +1,18 @@
+2016-03-10  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r197922.
+        https://bugs.webkit.org/show_bug.cgi?id=155340
+
+        This change broke storage/websql tests on ios-simulator.
+        (Requested by ryanhaddad on #webkit).
+
+        Reverted changeset:
+
+        "WebKit should adopt journal_mode=wal for all SQLite
+        databases."
+        https://bugs.webkit.org/show_bug.cgi?id=133496
+        http://trac.webkit.org/changeset/197922
+
 2016-03-10  Tim Horton  <timothy_hor...@apple.com>
 
         Fix the build again.

Modified: trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp (197979 => 197980)

--- trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp	2016-03-11 01:41:12 UTC (rev 197979)
+++ trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp	2016-03-11 01:46:31 UTC (rev 197980)
@@ -116,14 +116,17 @@
         LOG_ERROR("SQLite database could not set temp_store to memory");
 
     SQLiteStatement walStatement(*this, ASCIILiteral("PRAGMA journal_mode=WAL;"));
-    if (walStatement.prepareAndStep() == 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
+    if (result == SQLITE_ROW) {
         String mode = walStatement.getColumnText(0);
         if (!equalLettersIgnoringASCIICase(mode, "wal"))
-            LOG_ERROR("journal_mode of database should be 'WAL', but is '%s'", mode.utf8().data());
+            LOG_ERROR("journal_mode of database should be 'wal', but is '%s'", mode.utf8().data());
+    }
 #endif
-    } else
-        LOG_ERROR("SQLite database failed to set journal_mode to WAL, error: %s", lastErrorMsg());
 
     return isOpen();
 }

Modified: trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp (197979 => 197980)

--- trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp	2016-03-11 01:41:12 UTC (rev 197979)
+++ trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp	2016-03-11 01:46:31 UTC (rev 197980)
@@ -50,7 +50,7 @@
 
 int SQLiteFileSystem::openDatabase(const String& filename, sqlite3** database, bool)
 {
-    return sqlite3_open_v2(fileSystemRepresentation(filename).data(), database, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_AUTOPROXY, nullptr);
+    return sqlite3_open(fileSystemRepresentation(filename).data(), database);
 }
 
 String SQLiteFileSystem::appendDatabaseFileNameToPath(const String& path, const String& fileName)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes