Merge 96007 - IndexedDB: Null key path gets stored as empty string key path

Source/WebCore/storage/IDBLevelDBCoding.cpp

 /*
  * Copyright (C) 2011 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 52 matching lines @@
 // Object store meta-data:
 //
 //     The prefix is followed by a type byte, then a variable-length integer, and then another variable-length integer (FIXME: this should be a byte).
 //
 //     <database id, 0, 0, 50, object store id, 0> => utf16 object store name [ObjectStoreMetaDataKey]
 //     <database id, 0, 0, 50, object store id, 1> => utf16 key path [ObjectStoreMetaDataKey]
 //     <database id, 0, 0, 50, object store id, 2> => has auto increment [ObjectStoreMetaDataKey]
 //     <database id, 0, 0, 50, object store id, 3> => is evictable [ObjectStoreMetaDataKey]
 //     <database id, 0, 0, 50, object store id, 4> => last "version" number [ObjectStoreMetaDataKey]
 //     <database id, 0, 0, 50, object store id, 5> => maximum index id ever allocated [ObjectStoreMetaDataKey]
+//     <database id, 0, 0, 50, object store id, 6> => has key path (vs. null) [ObjectStoreMetaDataKey]
 //
 //
 // Index meta-data:
 //
 //     The prefix is followed by a type byte, then two variable-length integers, and then another type byte.
 //
 //     <database id, 0, 0, 100, object store id, index id, 0> => utf16 index name [IndexMetaDataKey]
 //     <database id, 0, 0, 100, object store id, index id, 1> => are index keys unique [IndexMetaDataKey]
 //     <database id, 0, 0, 100, object store id, index id, 2> => utf16 key path [IndexMetaDataKey]
 //
@@ skipping 767 matching lines @@
     ret.append(encodeVarInt(objectStoreId));
     ret.append(encodeVarInt(metaDataType));
     return ret;
 }
 
 Vector<char> ObjectStoreMetaDataKey::encodeMaxKey(int64_t databaseId)
 {
     return encode(databaseId, INT64_MAX, INT64_MAX);
 }
 
+Vector<char> ObjectStoreMetaDataKey::encodeMaxKey(int64_t databaseId, int64_t objectStoreId)
+{
+    return encode(databaseId, objectStoreId, INT64_MAX);
+}
+
 int64_t ObjectStoreMetaDataKey::objectStoreId() const
 {
     ASSERT(m_objectStoreId >= 0);
     return m_objectStoreId;
 }
 int64_t ObjectStoreMetaDataKey::metaDataType() const
 {
     ASSERT(m_metaDataType >= 0);
     return m_metaDataType;
 }
@@ skipping 436 matching lines @@
     RefPtr<IDBKey> key;
     decodeIDBKey(m_encodedUserKey.begin(), m_encodedUserKey.end(), key);
     return key;
 }
 
 } // namespace IDBLevelDBCoding
 } // namespace WebCore
 
 #endif // ENABLE(LEVELDB)
 #endif // ENABLE(INDEXED_DATABASE)