Changeset 65902 in webkit

Timestamp:

Aug 24, 2010 8:44:07 AM (14 years ago)

Author:

jorlow@chromium.org

Message:

2010-08-24 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by Steve Block.

IndexedDB needs to manually delete all objectStore data and indexes
​https://bugs.webkit.org/show_bug.cgi?id=44522

• storage/indexeddb/objectstore-removeobjectstore-expected.txt: Added.
• storage/indexeddb/objectstore-removeobjectstore.html: Added.
• storage/indexeddb/resources/shared.js: (unexpectedSuccessCallback):

2010-08-24 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by Steve Block.

IndexedDB needs to manually delete all objectStore data and indexes
​https://bugs.webkit.org/show_bug.cgi?id=44522

Apparently it's only newer versions of SQLite that handle cascade
delete. The rest silently fail. So do it manually.

Test: storage/indexeddb/objectstore-removeobjectstore.html

• storage/IDBDatabaseBackendImpl.cpp: (WebCore::IDBDatabaseBackendImpl::createObjectStore): (WebCore::doDelete): (WebCore::IDBDatabaseBackendImpl::removeObjectStore):
• storage/IDBDatabaseBackendImpl.h:
• storage/IDBFactoryBackendImpl.cpp: (WebCore::createTables):
• storage/IDBObjectStoreBackendImpl.cpp: (WebCore::IDBObjectStoreBackendImpl::removeIndex):
• storage/IDBObjectStoreBackendImpl.h: (WebCore::IDBObjectStoreBackendImpl::create): (WebCore::IDBObjectStoreBackendImpl::id):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/objectstore-removeobjectstore-expected.txt (added)
• LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html (added)
• LayoutTests/storage/indexeddb/resources/shared.js (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/storage/IDBDatabaseBackendImpl.cpp (modified) (3 diffs)
• WebCore/storage/IDBDatabaseBackendImpl.h (modified) (2 diffs)
• WebCore/storage/IDBFactoryBackendImpl.cpp (modified) (1 diff)
• WebCore/storage/IDBObjectStoreBackendImpl.cpp (modified) (1 diff)
• WebCore/storage/IDBObjectStoreBackendImpl.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-24  Jeremy Orlow  <jorlow@chromium.org>
+
+        Reviewed by Steve Block.
+
+        IndexedDB needs to manually delete all objectStore data and indexes
+        https://bugs.webkit.org/show_bug.cgi?id=44522
+
+        * storage/indexeddb/objectstore-removeobjectstore-expected.txt: Added.
+        * storage/indexeddb/objectstore-removeobjectstore.html: Added.
+        * storage/indexeddb/resources/shared.js:
+        (unexpectedSuccessCallback):
+
 2010-08-24  Sam Weinig  <sam@webkit.org>
 

trunk/LayoutTests/storage/indexeddb/resources/shared.js

@@ -52 +52 @@
 }
 
+function unexpectedSuccessCallback()
+{
+    testFailed("Success function called unexpectedly.");
+    debug("");
+    verifySuccessEvent(event);
+    done();
+}
+
 function unexpectedErrorCallback()
 {

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-24  Jeremy Orlow  <jorlow@chromium.org>
+
+        Reviewed by Steve Block.
+
+        IndexedDB needs to manually delete all objectStore data and indexes
+        https://bugs.webkit.org/show_bug.cgi?id=44522
+
+        Apparently it's only newer versions of SQLite that handle cascade
+        delete.  The rest silently fail.  So do it manually.
+
+        Test: storage/indexeddb/objectstore-removeobjectstore.html
+
+        * storage/IDBDatabaseBackendImpl.cpp:
+        (WebCore::IDBDatabaseBackendImpl::createObjectStore):
+        (WebCore::doDelete):
+        (WebCore::IDBDatabaseBackendImpl::removeObjectStore):
+        * storage/IDBDatabaseBackendImpl.h:
+        * storage/IDBFactoryBackendImpl.cpp:
+        (WebCore::createTables):
+        * storage/IDBObjectStoreBackendImpl.cpp:
+        (WebCore::IDBObjectStoreBackendImpl::removeIndex):
+        * storage/IDBObjectStoreBackendImpl.h:
+        (WebCore::IDBObjectStoreBackendImpl::create):
+        (WebCore::IDBObjectStoreBackendImpl::id):
+
 2010-08-23  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/storage/IDBDatabaseBackendImpl.cpp

@@ -33 +33 @@
 #include "SQLiteDatabase.h"
 #include "SQLiteStatement.h"
+#include "SQLiteTransaction.h"
 
 #if ENABLE(INDEXED_DATABASE)
@@ -142 +143 @@
     int64_t id = sqliteDatabase().lastInsertRowID();
 
-    RefPtr<IDBObjectStoreBackendInterface> objectStore = IDBObjectStoreBackendImpl::create(this, id, name, keyPath, autoIncrement);
+    RefPtr<IDBObjectStoreBackendImpl> objectStore = IDBObjectStoreBackendImpl::create(this, id, name, keyPath, autoIncrement);
     ASSERT(objectStore->name() == name);
     m_objectStores.set(name, objectStore);
-    callbacks->onSuccess(objectStore.release());
+    callbacks->onSuccess(objectStore.get());
 }
 
@@ -155 +156 @@
 }
 
+static void doDelete(SQLiteDatabase& db, const char* sql, int64_t id)
+{
+    SQLiteStatement deleteQuery(db, sql);
+    bool ok = deleteQuery.prepare() == SQLResultOk;
+    ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
+    deleteQuery.bindInt64(1, id);
+    ok = deleteQuery.step() == SQLResultDone;
+    ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
+}
+
 void IDBDatabaseBackendImpl::removeObjectStore(const String& name, PassRefPtr<IDBCallbacks> callbacks)
 {
-    if (!m_objectStores.contains(name)) {
+    RefPtr<IDBObjectStoreBackendImpl> objectStore = m_objectStores.get(name);
+    if (!objectStore) {
         callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::NOT_FOUND_ERR, "No objectStore with that name exists."));
         return;
     }
 
-    SQLiteStatement deleteQuery(sqliteDatabase(), "DELETE FROM ObjectStores WHERE name = ?");
-    bool ok = deleteQuery.prepare() == SQLResultOk;
-    ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
-    deleteQuery.bindText(1, name);
-    ok = deleteQuery.step() == SQLResultDone;
-    ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
+    SQLiteTransaction transaction(sqliteDatabase());
+    transaction.begin();
+    doDelete(sqliteDatabase(), "DELETE FROM ObjectStores WHERE id = ?", objectStore->id());
+    doDelete(sqliteDatabase(), "DELETE FROM ObjectStoreData WHERE objectStoreId = ?", objectStore->id());
+    doDelete(sqliteDatabase(), "DELETE FROM Indexes WHERE objectStoreId = ?", objectStore->id());
+    // FIXME: Delete index data as well.
+    transaction.commit();
 
     m_objectStores.remove(name);

trunk/WebCore/storage/IDBDatabaseBackendImpl.h

@@ -36 +36 @@
 namespace WebCore {
 
+class IDBObjectStoreBackendImpl;
 class IDBTransactionCoordinator;
 class SQLiteDatabase;
@@ -70 +71 @@
     String m_version;
 
-    typedef HashMap<String, RefPtr<IDBObjectStoreBackendInterface> > ObjectStoreMap;
+    typedef HashMap<String, RefPtr<IDBObjectStoreBackendImpl> > ObjectStoreMap;
     ObjectStoreMap m_objectStores;
 

trunk/WebCore/storage/IDBFactoryBackendImpl.cpp

@@ -89 +89 @@
 
         "DROP TABLE IF EXISTS Indexes",
-        "CREATE TABLE IF NOT EXISTS Indexes (id INTEGER PRIMARY KEY, objectStoreId INTEGER NOT NULL REFERENCES ObjectStore(id) ON DELETE CASCADE, name TEXT NOT NULL, keyPath TEXT, isUnique INTEGER NOT NULL)",
+        "CREATE TABLE IF NOT EXISTS Indexes (id INTEGER PRIMARY KEY, objectStoreId INTEGER NOT NULL REFERENCES ObjectStore(id), name TEXT NOT NULL, keyPath TEXT, isUnique INTEGER NOT NULL)",
         "DROP INDEX IF EXISTS Indexes_composit",
         "CREATE UNIQUE INDEX IF NOT EXISTS Indexes_composit ON Indexes(objectStoreId, name)",
 
         "DROP TABLE IF EXISTS ObjectStoreData",
-        "CREATE TABLE IF NOT EXISTS ObjectStoreData (id INTEGER PRIMARY KEY, objectStoreId INTEGER NOT NULL REFERENCES ObjectStore(id) ON DELETE CASCADE, keyString TEXT, keyDate INTEGER, keyNumber INTEGER, value TEXT NOT NULL)",
+        "CREATE TABLE IF NOT EXISTS ObjectStoreData (id INTEGER PRIMARY KEY, objectStoreId INTEGER NOT NULL REFERENCES ObjectStore(id), keyString TEXT, keyDate INTEGER, keyNumber INTEGER, value TEXT NOT NULL)",
         "DROP INDEX IF EXISTS ObjectStoreData_composit",
         "CREATE UNIQUE INDEX IF NOT EXISTS ObjectStoreData_composit ON ObjectStoreData(keyString, keyDate, keyNumber, objectStoreId)"

trunk/WebCore/storage/IDBObjectStoreBackendImpl.cpp

@@ -260 +260 @@
     ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
 
+    // FIXME: Delete index data as well.
+
     m_indexes.remove(name);
     callbacks->onSuccess();

trunk/WebCore/storage/IDBObjectStoreBackendImpl.h

@@ -40 +40 @@
 class IDBObjectStoreBackendImpl : public IDBObjectStoreBackendInterface {
 public:
-    static PassRefPtr<IDBObjectStoreBackendInterface> create(IDBDatabaseBackendImpl* database, int64_t id, const String& name, const String& keyPath, bool autoIncrement)
+    static PassRefPtr<IDBObjectStoreBackendImpl> create(IDBDatabaseBackendImpl* database, int64_t id, const String& name, const String& keyPath, bool autoIncrement)
     {
         return adoptRef(new IDBObjectStoreBackendImpl(database, id, name, keyPath, autoIncrement));
@@ -46 +46 @@
     ~IDBObjectStoreBackendImpl();
 
+    int64_t id() const { return m_id; }
     String name() const { return m_name; }
     String keyPath() const { return m_keyPath; }