Changeset 76126 in webkit

Timestamp:

Jan 19, 2011 8:24:05 AM (13 years ago)

Author:

hans@chromium.org

Message:

2011-01-19 Hans Wennborg <​hans@chromium.org>

Reviewed by Jeremy Orlow.

IndexedDB: Support auto-increment keys
​https://bugs.webkit.org/show_bug.cgi?id=52576

Add layout test for auto increment keys.
Update previous test not to consider auto increment an error.

• storage/indexeddb/create-object-store-options-expected.txt:
• storage/indexeddb/create-object-store-options.html:
• storage/indexeddb/objectstore-autoincrement-expected.txt: Added.
• storage/indexeddb/objectstore-autoincrement.html: Added.

2011-01-19 Hans Wennborg <​hans@chromium.org>

Reviewed by Jeremy Orlow.

IndexedDB: Support auto-increment keys
​https://bugs.webkit.org/show_bug.cgi?id=52576

Add support for auto-increment keys.

Test: storage/indexeddb/objectstore-autoincrement.html

• storage/IDBDatabase.cpp: (WebCore::IDBDatabase::createObjectStore):
• storage/IDBObjectStoreBackendImpl.cpp: (WebCore::genAutoIncrementKey): (WebCore::IDBObjectStoreBackendImpl::putInternal):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/create-object-store-options-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/create-object-store-options.html (modified) (1 diff)
• LayoutTests/storage/indexeddb/objectstore-autoincrement-expected.txt (added)
• LayoutTests/storage/indexeddb/objectstore-autoincrement.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/storage/IDBDatabase.cpp (modified) (1 diff)
• Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp (modified) (6 diffs)
• Source/WebCore/storage/IDBObjectStoreBackendImpl.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-19  Hans Wennborg  <hans@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        IndexedDB: Support auto-increment keys
+        https://bugs.webkit.org/show_bug.cgi?id=52576
+
+        Add layout test for auto increment keys.
+        Update previous test not to consider auto increment an error.
+
+        * storage/indexeddb/create-object-store-options-expected.txt:
+        * storage/indexeddb/create-object-store-options.html:
+        * storage/indexeddb/objectstore-autoincrement-expected.txt: Added.
+        * storage/indexeddb/objectstore-autoincrement.html: Added.
+
 2011-01-19  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/storage/indexeddb/create-object-store-options-expected.txt

@@ -18 +18 @@
 db.createObjectStore('b')
 db.createObjectStore('c', {autoIncrement: true});
-PASS Exception thrown
-PASS code is webkitIDBDatabaseException.UNKNOWN_ERR
 trans = db.transaction({mode: webkitIDBTransaction.READ_WRITE})
 PASS trans.mode is webkitIDBTransaction.READ_WRITE

trunk/LayoutTests/storage/indexeddb/create-object-store-options.html

@@ -45 +45 @@
     evalAndLog("db.createObjectStore('b')");
 
-    try {
-        // FIXME: This should work in the future.
-        debug("db.createObjectStore('c', {autoIncrement: true});");
-        db.createObjectStore('c', {autoIncrement: true});
-        testFailed('createObjectStore with autoIncrement = true should throw');
-    } catch (err) {
-        testPassed("Exception thrown");
-        code = err.code;
-        shouldBe("code", "webkitIDBDatabaseException.UNKNOWN_ERR");
-    }
+    debug("db.createObjectStore('c', {autoIncrement: true});");
+    db.createObjectStore('c', {autoIncrement: true});
 
     trans = evalAndLog("trans = db.transaction({mode: webkitIDBTransaction.READ_WRITE})");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-19  Hans Wennborg  <hans@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        IndexedDB: Support auto-increment keys
+        https://bugs.webkit.org/show_bug.cgi?id=52576
+
+        Add support for auto-increment keys.
+
+        Test: storage/indexeddb/objectstore-autoincrement.html
+
+        * storage/IDBDatabase.cpp:
+        (WebCore::IDBDatabase::createObjectStore):
+        * storage/IDBObjectStoreBackendImpl.cpp:
+        (WebCore::genAutoIncrementKey):
+        (WebCore::IDBObjectStoreBackendImpl::putInternal):
+
 2011-01-19  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/storage/IDBDatabase.cpp

@@ -74 +74 @@
     // FIXME: Look up evictable and pass that on as well.
 
-    if (autoIncrement) {
-        // FIXME: Implement support for auto increment.
-        ec = IDBDatabaseException::UNKNOWN_ERR;
-        return 0;
-    }
-
     RefPtr<IDBObjectStoreBackendInterface> objectStore = m_backend->createObjectStore(name, keyPath, autoIncrement, m_setVersionTransaction.get(), ec);
     if (!objectStore) {

trunk/Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp

@@ -60 +60 @@
     , m_keyPath(keyPath)
     , m_autoIncrement(autoIncrement)
+    , m_autoIncrementNumber(-1)
 {
     loadIndexes();
@@ -70 +71 @@
     , m_keyPath(keyPath)
     , m_autoIncrement(autoIncrement)
+    , m_autoIncrementNumber(-1)
 {
 }
@@ -114 +116 @@
 
     ASSERT((key->type() == IDBKey::StringType) != query.isColumnNull(0));
-    // FIXME: Implement date.
+    ASSERT((key->type() == IDBKey::DateType) != query.isColumnNull(1));
     ASSERT((key->type() == IDBKey::NumberType) != query.isColumnNull(2));
 
@@ -201 +203 @@
     RefPtr<IDBKey> key = prpKey;
 
-    // FIXME: Support auto-increment.
-
-    if (!objectStore->m_keyPath.isNull()) {
-        if (key) {
-            callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "A key was supplied for an objectStore that has a keyPath."));
+    if (!objectStore->m_keyPath.isNull() && key) {
+        callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::DATA_ERR, "A key was supplied for an objectStore that has a keyPath."));
+        return;
+    }
+
+    if (objectStore->autoIncrement() && key) {
+        callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::DATA_ERR, "A key was supplied for an objectStore that is using auto increment."));
+        return;
+    }
+
+    if (objectStore->autoIncrement()) {
+        key = objectStore->genAutoIncrementKey();
+
+        if (!objectStore->m_keyPath.isNull()) {
+            // FIXME: Inject the generated key into the object.
+            callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Adding data to object stores with auto increment and in-line keys not yet supported."));
             return;
         }
+    } else if (!objectStore->m_keyPath.isNull()) {
         key = fetchKeyFromKeyPath(value.get(), objectStore->m_keyPath);
+
         if (!key) {
-            callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "The key could not be fetched from the keyPath."));
+            callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::DATA_ERR, "The key could not be fetched from the keyPath."));
             return;
         }
@@ -217 +232 @@
         return;
     }
+
     if (key->type() == IDBKey::NullType) {
         callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::DATA_ERR, "NULL key is not allowed."));
@@ -512 +528 @@
 }
 
+PassRefPtr<IDBKey> IDBObjectStoreBackendImpl::genAutoIncrementKey()
+{
+    if (m_autoIncrementNumber > 0)
+        return IDBKey::createNumber(m_autoIncrementNumber++);
+
+    String sql = "SELECT max(keyNumber) + 1 FROM ObjectStoreData WHERE objectStoreId = ? AND keyString IS NULL AND keyDate IS NULL";
+
+    SQLiteStatement query(sqliteDatabase(), sql);
+    bool ok = query.prepare() == SQLResultOk;
+    ASSERT_UNUSED(ok, ok);
+
+    query.bindInt64(1, id());
+
+    if (query.step() != SQLResultRow || query.isColumnNull(0))
+        m_autoIncrementNumber = 1;
+    else
+        m_autoIncrementNumber = static_cast<int>(query.getColumnDouble(0));
+
+    return IDBKey::createNumber(m_autoIncrementNumber++);
+}
+
 
 } // namespace WebCore

trunk/Source/WebCore/storage/IDBObjectStoreBackendImpl.h

@@ -83 +83 @@
     void loadIndexes();
     SQLiteDatabase& sqliteDatabase() const;
+    PassRefPtr<IDBKey> genAutoIncrementKey();
 
     static void getInternal(ScriptExecutionContext*, PassRefPtr<IDBObjectStoreBackendImpl>, PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks>);
@@ -104 +105 @@
     typedef HashMap<String, RefPtr<IDBIndexBackendImpl> > IndexMap;
     IndexMap m_indexes;
+    int m_autoIncrementNumber;
 };