<!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>[199120] trunk/Source/WebCore</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/199120">199120</a></dd>

<dt>Author</dt> <dd>beidson@apple.com</dd>

<dt>Date</dt> <dd>2016-04-06 15:25:37 -0700 (Wed, 06 Apr 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Modern IDB: Make sure SQLite backing store records have a INTEGER PRIMARY KEY column.

https://bugs.webkit.org/show_bug.cgi?id=156264

Reviewed by Alex Christensen.

No new tests (No testable change in behavior yet, current tests pass).

* Modules/indexeddb/IDBKeyData.cpp:

(WebCore::IDBKeyData::encode): Fix the key name for backwards compatibility.

(WebCore::IDBKeyData::decode): Ditto.

* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:

(WebCore::IDBServer::v3RecordsTableSchema): Added v3 Records schema that includes a primary key column.

(WebCore::IDBServer::v3RecordsTableSchemaAlternate):

(WebCore::IDBServer::createOrMigrateRecordsTableIfNecessary): Upgrade to v3 instead of v2.

(WebCore::IDBServer::SQLiteIDBBackingStore::addRecord):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199119 => 199120)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-04-06 22:22:02 UTC (rev 199119)

+++ trunk/Source/WebCore/ChangeLog        2016-04-06 22:25:37 UTC (rev 199120)

</span><span class="lines">@@ -1,3 +1,22 @@

</span><ins>+2016-04-06  Brady Eidson  &lt;beidson@apple.com&gt;

+

+        Modern IDB: Make sure SQLite backing store records have a INTEGER PRIMARY KEY column.

+        https://bugs.webkit.org/show_bug.cgi?id=156264

+

+        Reviewed by Alex Christensen.

+

+        No new tests (No testable change in behavior yet, current tests pass).

+

+        * Modules/indexeddb/IDBKeyData.cpp:

+        (WebCore::IDBKeyData::encode): Fix the key name for backwards compatibility.

+        (WebCore::IDBKeyData::decode): Ditto.

+

+        * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:

+        (WebCore::IDBServer::v3RecordsTableSchema): Added v3 Records schema that includes a primary key column.

+        (WebCore::IDBServer::v3RecordsTableSchemaAlternate):

+        (WebCore::IDBServer::createOrMigrateRecordsTableIfNecessary): Upgrade to v3 instead of v2.

+        (WebCore::IDBServer::SQLiteIDBBackingStore::addRecord):

+

</ins><span class="cx"> 2016-04-06  Simon Fraser  &lt;simon.fraser@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Avoid using an unengaged Optional&lt;FloatRect&gt; when positioning the tiled scrolling indicator

</span></span></pre></div>

<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (199119 => 199120)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp        2016-04-06 22:22:02 UTC (rev 199119)

+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp        2016-04-06 22:25:37 UTC (rev 199120)

</span><span class="lines">@@ -133,7 +133,7 @@

</span><span class="cx">     if (m_isNull)

</span><span class="cx">         return;

</span><span class="cx"> 

</span><del>-    encoder.encodeEnum(&quot;m_type&quot;, m_type);

</del><ins>+    encoder.encodeEnum(&quot;type&quot;, m_type);

</ins><span class="cx"> 

</span><span class="cx">     switch (m_type) {

</span><span class="cx">     case KeyType::Invalid:

</span><span class="lines">@@ -175,7 +175,7 @@

</span><span class="cx">             || value == KeyType::Number

</span><span class="cx">             || value == KeyType::Min;

</span><span class="cx">     };

</span><del>-    if (!decoder.decodeEnum(&quot;m_type&quot;, result.m_type, enumFunction))

</del><ins>+    if (!decoder.decodeEnum(&quot;type&quot;, result.m_type, enumFunction))

</ins><span class="cx">         return false;

</span><span class="cx"> 

</span><span class="cx">     if (result.m_type == KeyType::Invalid)

</span></span></pre></div>

<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (199119 => 199120)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp        2016-04-06 22:22:02 UTC (rev 199119)

+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp        2016-04-06 22:25:37 UTC (rev 199120)

</span><span class="lines">@@ -109,6 +109,23 @@

</span><span class="cx">     return v2RecordsTableSchemaString;

</span><span class="cx"> }

</span><span class="cx"> 

</span><ins>+static const String v3RecordsTableSchema(const String&amp; tableName)

+{

+    return makeString(&quot;CREATE TABLE &quot;, tableName, &quot; (objectStoreID INTEGER NOT NULL ON CONFLICT FAIL, key TEXT COLLATE IDBKEY NOT NULL ON CONFLICT FAIL, value NOT NULL ON CONFLICT FAIL, recordID INTEGER PRIMARY KEY)&quot;);

+}

+

+static const String&amp; v3RecordsTableSchema()

+{

+    static NeverDestroyed&lt;WTF::String&gt; v3RecordsTableSchemaString(v3RecordsTableSchema(&quot;Records&quot;));

+    return v3RecordsTableSchemaString;

+}

+

+static const String&amp; v3RecordsTableSchemaAlternate()

+{

+    static NeverDestroyed&lt;WTF::String&gt; v3RecordsTableSchemaString(v3RecordsTableSchema(&quot;\&quot;Records\&quot;&quot;));

+    return v3RecordsTableSchemaString;

+}

+

</ins><span class="cx"> static const String v1IndexRecordsTableSchema(const String&amp; tableName)

</span><span class="cx"> {

</span><span class="cx">     return makeString(&quot;CREATE TABLE &quot;, tableName, &quot; (indexID INTEGER NOT NULL ON CONFLICT FAIL, objectStoreID INTEGER NOT NULL ON CONFLICT FAIL, key TEXT COLLATE IDBKEY NOT NULL ON CONFLICT FAIL, value NOT NULL ON CONFLICT FAIL)&quot;);

</span><span class="lines">@@ -201,7 +218,7 @@

</span><span class="cx"> 

<span class="cx">         // If there is no Records table at all, create it and then bail.

</span><span class="cx">         if (sqliteResult == SQLITE_DONE) {

</span><del>-            if (!database.executeCommand(v2RecordsTableSchema())) {

</del><ins>+            if (!database.executeCommand(v3RecordsTableSchema())) {

</ins><span class="cx">                 LOG_ERROR(&quot;Could not create Records table in database (%i) - %s&quot;, database.lastError(), database.lastErrorMsg());

</span><span class="cx">                 return false;

</span><span class="cx">             }

</span><span class="lines">@@ -220,24 +237,25 @@

</span><span class="cx">     ASSERT(!currentSchema.isEmpty());

</span><span class="cx"> 

<span class="cx">     // If the schema in the backing store is the current schema, we're done.

</span><del>-    if (currentSchema == v2RecordsTableSchema() || currentSchema == v2RecordsTableSchemaAlternate())

</del><ins>+    if (currentSchema == v3RecordsTableSchema() || currentSchema == v3RecordsTableSchemaAlternate())

</ins><span class="cx">         return true;

</span><span class="cx"> 

<span class="cx">     // If the record table is not the current schema then it must be one of the previous schemas.

<span class="cx">     // If it is not then the database is in an unrecoverable state and this should be considered a fatal error.

</span><del>-    if (currentSchema != v1RecordsTableSchema() &amp;&amp; currentSchema != v1RecordsTableSchemaAlternate())

</del><ins>+    if (currentSchema != v1RecordsTableSchema() &amp;&amp; currentSchema != v1RecordsTableSchemaAlternate()

+        &amp;&amp; currentSchema != v2RecordsTableSchema() &amp;&amp; currentSchema != v2RecordsTableSchemaAlternate())

</ins><span class="cx">         RELEASE_ASSERT_NOT_REACHED();

</span><span class="cx"> 

</span><span class="cx">     SQLiteTransaction transaction(database);

</span><span class="cx">     transaction.begin();

</span><span class="cx"> 

<span class="cx">     // Create a temporary table with the correct schema and migrate all existing content over.

</span><del>-    if (!database.executeCommand(v2RecordsTableSchema(&quot;_Temp_Records&quot;))) {

</del><ins>+    if (!database.executeCommand(v3RecordsTableSchema(&quot;_Temp_Records&quot;))) {

</ins><span class="cx">         LOG_ERROR(&quot;Could not create temporary records table in database (%i) - %s&quot;, database.lastError(), database.lastErrorMsg());

</span><span class="cx">         return false;

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    if (!database.executeCommand(&quot;INSERT INTO _Temp_Records SELECT * FROM Records&quot;)) {

</del><ins>+    if (!database.executeCommand(&quot;INSERT INTO _Temp_Records (objectStoreID, key, value) SELECT objectStoreID, CAST(key AS TEXT), value FROM Records&quot;)) {

</ins><span class="cx">         LOG_ERROR(&quot;Could not migrate existing Records content (%i) - %s&quot;, database.lastError(), database.lastErrorMsg());

</span><span class="cx">         return false;

</span><span class="cx">     }

</span><span class="lines">@@ -1306,7 +1324,7 @@

</span><span class="cx">         return { IDBDatabaseException::UnknownError, ASCIILiteral(&quot;Unable to serialize IDBKey to be stored in an object store&quot;) };

</span><span class="cx">     }

</span><span class="cx">     {

</span><del>-        SQLiteStatement sql(*m_sqliteDB, ASCIILiteral(&quot;INSERT INTO Records VALUES (?, CAST(? AS TEXT), ?);&quot;));

</del><ins>+        SQLiteStatement sql(*m_sqliteDB, ASCIILiteral(&quot;INSERT INTO Records VALUES (?, CAST(? AS TEXT), ?, NULL);&quot;));

</ins><span class="cx">         if (sql.prepare() != SQLITE_OK

</span><span class="cx">             || sql.bindInt64(1, objectStoreInfo.identifier()) != SQLITE_OK

</span><span class="cx">             || sql.bindBlob(2, keyBuffer-&gt;data(), keyBuffer-&gt;size()) != SQLITE_OK

</span></span></pre>

</div>

</div>

</body>

</html>