<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185619] tags/Safari-601.1.35.2/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185619">185619</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 15:17:28 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/185599">r185599</a>. rdar://problem/17357002</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6011352SourceWebKit2ChangeLog">tags/Safari-601.1.35.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari6011352SourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp">tags/Safari-601.1.35.2/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6011352SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.35.2/Source/WebKit2/ChangeLog (185618 => 185619)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.35.2/Source/WebKit2/ChangeLog 2015-06-16 22:13:19 UTC (rev 185618)
+++ tags/Safari-601.1.35.2/Source/WebKit2/ChangeLog 2015-06-16 22:17:28 UTC (rev 185619)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-06-16 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r185599.
+
+ 2015-06-16 Brady Eidson <beidson@apple.com>
+
+ IDB: Records table migration doesn't work with all versions of SQLite.
+ https://bugs.webkit.org/show_bug.cgi?id=145993
+
+ Reviewed by Darin Adler, provisionally reviewed by Jon Lee.
+
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::v1RecordsTableSchema):
+ (WebKit::v1RecordsTableSchemaAlternate):
+ (WebKit::v2RecordsTableSchema):
+ (WebKit::v2RecordsTableSchemaAlternate):
+ (WebKit::createOrMigrateRecordsTableIfNecessary): Check both v1 and v1 Alternate whenever we check for the v1 schema.
+ Ditto for the v2 schema. Crash all builds if the current schema is none of these.
+
</ins><span class="cx"> 2015-06-15 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r185487. rdar://problem/21277462
</span></span></pre></div>
<a id="tagsSafari6011352SourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.35.2/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (185618 => 185619)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.35.2/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2015-06-16 22:13:19 UTC (rev 185618)
+++ tags/Safari-601.1.35.2/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2015-06-16 22:17:28 UTC (rev 185619)
</span><span class="lines">@@ -54,20 +54,26 @@
</span><span class="cx"> // Current version of the metadata schema being used in the metadata database.
</span><span class="cx"> static const int currentMetadataVersion = 1;
</span><span class="cx">
</span><ins>+static const String v1RecordsTableSchema(const String& tableName)
+{
+ return makeString("CREATE TABLE ", tableName, " (objectStoreID INTEGER NOT NULL ON CONFLICT FAIL, key TEXT COLLATE IDBKEY NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, value NOT NULL ON CONFLICT FAIL)");
+}
+
</ins><span class="cx"> static const String& v1RecordsTableSchema()
</span><span class="cx"> {
</span><del>- static NeverDestroyed<WTF::String> v1RecordsTableSchemaString(ASCIILiteral(
- "CREATE TABLE Records (objectStoreID INTEGER NOT NULL ON CONFLICT FAIL, key TEXT COLLATE IDBKEY NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, value NOT NULL ON CONFLICT FAIL)"));
</del><ins>+ static NeverDestroyed<WTF::String> v1RecordsTableSchemaString(v1RecordsTableSchema("Records"));
</ins><span class="cx"> return v1RecordsTableSchemaString;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const String& v1RecordsTableSchemaAlternate()
+{
+ static NeverDestroyed<WTF::String> v1RecordsTableSchemaString(v1RecordsTableSchema("\"Records\""));
+ return v1RecordsTableSchemaString;
+}
+
</ins><span class="cx"> static const String v2RecordsTableSchema(const String& tableName)
</span><span class="cx"> {
</span><del>- StringBuilder builder;
- builder.appendLiteral("CREATE TABLE ");
- builder.append(tableName);
- builder.appendLiteral(" (objectStoreID INTEGER NOT NULL ON CONFLICT FAIL, key TEXT COLLATE IDBKEY NOT NULL ON CONFLICT FAIL, value NOT NULL ON CONFLICT FAIL)");
- return builder.toString();
</del><ins>+ return makeString("CREATE TABLE ", tableName, " (objectStoreID INTEGER NOT NULL ON CONFLICT FAIL, key TEXT COLLATE IDBKEY NOT NULL ON CONFLICT FAIL, value NOT NULL ON CONFLICT FAIL)");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const String& v2RecordsTableSchema()
</span><span class="lines">@@ -76,6 +82,12 @@
</span><span class="cx"> return v2RecordsTableSchemaString;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const String& v2RecordsTableSchemaAlternate()
+{
+ static NeverDestroyed<WTF::String> v2RecordsTableSchemaString(v2RecordsTableSchema("\"Records\""));
+ return v2RecordsTableSchemaString;
+}
+
</ins><span class="cx"> static int64_t generateDatabaseId()
</span><span class="cx"> {
</span><span class="cx"> static int64_t databaseID = 0;
</span><span class="lines">@@ -140,14 +152,13 @@
</span><span class="cx"> ASSERT(!currentSchema.isEmpty());
</span><span class="cx">
</span><span class="cx"> // If the schema in the backing store is the current schema, we're done.
</span><del>- if (currentSchema == v2RecordsTableSchema())
</del><ins>+ if (currentSchema == v2RecordsTableSchema() || currentSchema == v2RecordsTableSchemaAlternate())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- // Currently the Records table should only be one of either the v1 or v2 schemas.
- if (currentSchema != v1RecordsTableSchema()) {
- ASSERT_NOT_REACHED();
- return false;
- }
</del><ins>+ // If the record table is not the current schema then it must be one of the previous schemas.
+ // If it is not then the database is in an unrecoverable state and this should be considered a fatal error.
+ if (currentSchema != v1RecordsTableSchema() && currentSchema != v1RecordsTableSchemaAlternate())
+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx">
</span><span class="cx"> SQLiteTransaction transaction(database);
</span><span class="cx"> transaction.begin();
</span></span></pre>
</div>
</div>
</body>
</html>