IndexedDB: Make DOMException messages more useful.

Source/modules/indexeddb/IDBCursor.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 108 matching lines @@
 
 IDBAny* IDBCursor::source() const
 {
     return m_source.get();
 }
 
 PassRefPtr<IDBRequest> IDBCursor::update(ScriptState* state, ScriptValue& value, ExceptionState& es)
 {
     IDB_TRACE("IDBCursor::update");
 
-    if (!m_gotValue || isKeyCursor() || isDeleted()) {
-        es.throwDOMException(InvalidStateError);
+    if (!m_gotValue) {
+        es.throwDOMException(InvalidStateError, IDBDatabase::noValueErrorMessage);
+        return 0;
+    }
+    if (isKeyCursor()) {
+        es.throwDOMException(InvalidStateError, IDBDatabase::isKeyCursorErrorMessage);
+        return 0;
+    }
+    if (isDeleted()) {
+        es.throwDOMException(InvalidStateError, IDBDatabase::sourceDeletedErrorMessage);
+        return 0;
+    }
+    if (m_transaction->isFinished()) {
+        es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
         return 0;
     }
     if (!m_transaction->isActive()) {
-        es.throwDOMException(TransactionInactiveError);
+        es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
         return 0;
     }
     if (m_transaction->isReadOnly()) {
         es.throwDOMException(ReadOnlyError);
         return 0;
     }
 
     RefPtr<IDBObjectStore> objectStore = effectiveObjectStore();
     const IDBKeyPath& keyPath = objectStore->metadata().keyPath;
     const bool usesInLineKeys = !keyPath.isNull();
     if (usesInLineKeys) {
         RefPtr<IDBKey> keyPathKey = createIDBKeyFromScriptValueAndKeyPath(m_request->requestState(), value, keyPath);
         if (!keyPathKey || !keyPathKey->isEqual(m_currentPrimaryKey.get())) {
-            es.throwDOMException(DataError);
+            es.throwDOMException(DataError, "The effective object store of this cursor uses in-line keys and evaluating the key path of the value parameter results in a different value than the cursor's effective key.");
             return 0;
         }
     }
 
     return objectStore->put(IDBDatabaseBackendInterface::CursorUpdate, IDBAny::create(this), state, value, m_currentPrimaryKey, es);
 }
 
 void IDBCursor::advance(unsigned long count, ExceptionState& es)
 {
     IDB_TRACE("IDBCursor::advance");
-    if (!m_gotValue || isDeleted()) {
-        es.throwDOMException(InvalidStateError);
+    if (!m_gotValue) {
+        es.throwDOMException(InvalidStateError, IDBDatabase::noValueErrorMessage);
+        return;
+    }
+    if (isDeleted()) {
+        es.throwDOMException(InvalidStateError, IDBDatabase::sourceDeletedErrorMessage);
         return;
     }
 
+    if (m_transaction->isFinished()) {
+        es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
+        return;
+    }
     if (!m_transaction->isActive()) {
-        es.throwDOMException(TransactionInactiveError);
+        es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
         return;
     }
 
     if (!count) {
         es.throwTypeError();
         return;
     }
 
     m_request->setPendingCursor(this);
     m_gotValue = false;
     m_backend->advance(count, m_request);
 }
 
 void IDBCursor::continueFunction(ScriptExecutionContext* context, const ScriptValue& keyValue, ExceptionState& es)
 {
     DOMRequestState requestState(context);
     RefPtr<IDBKey> key = keyValue.isUndefined() ? 0 : scriptValueToIDBKey(&requestState, keyValue);
     continueFunction(key.release(), es);
 }
 
 void IDBCursor::continueFunction(PassRefPtr<IDBKey> key, ExceptionState& es)
 {
     IDB_TRACE("IDBCursor::continue");
     if (key && !key->isValid()) {
-        es.throwDOMException(DataError);
+        es.throwDOMException(DataError, IDBDatabase::notValidKeyErrorMessage);
         return;
     }
 
+    if (m_transaction->isFinished()) {
+        es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
+        return;
+    }
     if (!m_transaction->isActive()) {
-        es.throwDOMException(TransactionInactiveError);
+        es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
         return;
     }
 
-    if (!m_gotValue || isDeleted()) {
-        es.throwDOMException(InvalidStateError);
+    if (!m_gotValue) {
+        es.throwDOMException(InvalidStateError, IDBDatabase::noValueErrorMessage);
         return;
     }
 
+    if (isDeleted()) {
+        es.throwDOMException(InvalidStateError, IDBDatabase::sourceDeletedErrorMessage);
+        return;
+    }
+
     if (key) {
         ASSERT(m_currentKey);
         if (m_direction == IndexedDB::CursorNext || m_direction == IndexedDB::CursorNextNoDuplicate) {
             if (!m_currentKey->isLessThan(key.get())) {
-                es.throwDOMException(DataError);
+                es.throwDOMException(DataError, "The parameter is less than or equal to this cursor's position.");
                 return;
             }
         } else {
             if (!key->isLessThan(m_currentKey.get())) {
-                es.throwDOMException(DataError);
+                es.throwDOMException(DataError, "The parameter is greater than or equal to this cursor's position.");
                 return;
             }
         }
     }
 
     // FIXME: We're not using the context from when continue was called, which means the callback
     //        will be on the original context openCursor was called on. Is this right?
     m_request->setPendingCursor(this);
     m_gotValue = false;
     m_backend->continueFunction(key, m_request);
 }
 
 PassRefPtr<IDBRequest> IDBCursor::deleteFunction(ScriptExecutionContext* context, ExceptionState& es)
 {
     IDB_TRACE("IDBCursor::delete");
+    if (m_transaction->isFinished()) {
+        es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
+        return 0;
+    }
     if (!m_transaction->isActive()) {
-        es.throwDOMException(TransactionInactiveError);
+        es.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
         return 0;
     }
     if (m_transaction->isReadOnly()) {
         es.throwDOMException(ReadOnlyError);
         return 0;
     }
 
-    if (!m_gotValue || isKeyCursor() || isDeleted()) {
-        es.throwDOMException(InvalidStateError);
+    if (!m_gotValue) {
+        es.throwDOMException(InvalidStateError, IDBDatabase::noValueErrorMessage);
+        return 0;
+    }
+    if (isKeyCursor()) {
+        es.throwDOMException(InvalidStateError, IDBDatabase::isKeyCursorErrorMessage);
+        return 0;
+    }
+    if (isDeleted()) {
+        es.throwDOMException(InvalidStateError, IDBDatabase::sourceDeletedErrorMessage);
         return 0;
     }
 
     RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(m_currentPrimaryKey, es);
     ASSERT(!es);
 
     RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get());
     m_transaction->backendDB()->deleteRange(m_transaction->id(), effectiveObjectStore()->id(), keyRange, request);
     return request.release();
 }
@@ skipping 83 matching lines @@
     case IndexedDB::CursorPrevNoDuplicate:
         return IDBCursor::directionPrevUnique();
 
     default:
         ASSERT_NOT_REACHED();
         return IDBCursor::directionNext();
     }
 }
 
 } // namespace WebCore