1 files changed, 16 insertions, 115 deletions

diff --git a/Source/WebCore/storage/IDBKey.cpp b/Source/WebCore/storage/IDBKey.cpp
index 5f45543..35156e8 100644
--- a/Source/WebCore/storage/IDBKey.cpp
+++ b/Source/WebCore/storage/IDBKey.cpp
@@ -28,9 +28,6 @@
 
 #if ENABLE(INDEXED_DATABASE)
 
-#include "SQLiteStatement.h"
-#include "SerializedScriptValue.h"
-
 namespace WebCore {
 
 IDBKey::IDBKey()
@@ -42,35 +39,21 @@ IDBKey::~IDBKey()
 {
 }
 
-PassRefPtr<IDBKey> IDBKey::fromQuery(SQLiteStatement& query, int baseColumn)
-{
-    if (query.columnCount() <= baseColumn)
-        return 0;
-
-    if (!query.isColumnNull(baseColumn))
-        return IDBKey::createString(query.getColumnText(baseColumn));
-
-    if (!query.isColumnNull(baseColumn + 1))
-        return IDBKey::createDate(query.getColumnDouble(baseColumn + 1));
-
-    if (!query.isColumnNull(baseColumn + 2))
-        return IDBKey::createNumber(query.getColumnDouble(baseColumn + 2));
-
-    return IDBKey::createNull();
-}
-
-bool IDBKey::isEqual(IDBKey* other)
+bool IDBKey::isLessThan(const IDBKey* other) const
 {
-    if (!other || other->m_type != m_type)
+    ASSERT(other);
+    if (other->m_type < m_type)
+        return true;
+    if (other->m_type > m_type)
         return false;
 
     switch (m_type) {
     case StringType:
-        return other->m_string == m_string;
+        return codePointCompare(other->m_string, m_string) > 0;
     case DateType:
-        return other->m_date == m_date;
+        return other->m_date > m_date;
     case NumberType:
-        return other->m_number == m_number;
+        return other->m_number > m_number;
     case NullType:
         return true;
     }
@@ -79,106 +62,24 @@ bool IDBKey::isEqual(IDBKey* other)
     return false;
 }
 
-String IDBKey::whereSyntax(String qualifiedTableName) const
-{
-    switch (m_type) {
-    case IDBKey::StringType:
-        return qualifiedTableName + "keyString = ?  AND  " + qualifiedTableName + "keyDate IS NULL  AND  " + qualifiedTableName + "keyNumber IS NULL  ";
-    case IDBKey::NumberType:
-        return qualifiedTableName + "keyString IS NULL  AND  " + qualifiedTableName + "keyDate IS NULL  AND  " + qualifiedTableName + "keyNumber = ?  ";
-    case IDBKey::DateType:
-        return qualifiedTableName + "keyString IS NULL  AND  " + qualifiedTableName + "keyDate = ?  AND  " + qualifiedTableName + "keyNumber IS NULL  ";
-    case IDBKey::NullType:
-        return qualifiedTableName + "keyString IS NULL  AND  " + qualifiedTableName + "keyDate IS NULL  AND  " + qualifiedTableName + "keyNumber IS NULL  ";
-    }
-
-    ASSERT_NOT_REACHED();
-    return "";
-}
-
-String IDBKey::lowerCursorWhereFragment(String comparisonOperator, String qualifiedTableName)
+bool IDBKey::isEqual(const IDBKey* other) const
 {
-    switch (m_type) {
-    case StringType:
-        return "? " + comparisonOperator + " " + qualifiedTableName + "keyString  AND  ";
-    case DateType:
-        return "(? " + comparisonOperator + " " + qualifiedTableName + "keyDate  OR NOT " + qualifiedTableName + "keyString IS NULL)  AND  ";
-    case NumberType:
-        return "(? " + comparisonOperator + " " + qualifiedTableName + "keyNumber  OR  NOT " + qualifiedTableName + "keyString IS NULL  OR  NOT " + qualifiedTableName + "keyDate IS NULL)  AND  ";
-    case NullType:
-        if (comparisonOperator == "<")
-            return "NOT(" + qualifiedTableName + "keyString IS NULL  AND  " + qualifiedTableName + "keyDate IS NULL  AND  " + qualifiedTableName + "keyNumber IS NULL)  AND  ";
-        return ""; // If it's =, the upper bound half will do the constraining. If it's <=, then that's a no-op.
-    }
-    ASSERT_NOT_REACHED();
-    return "";
-}
+    if (!other || other->m_type != m_type)
+        return false;
 
-String IDBKey::upperCursorWhereFragment(String comparisonOperator, String qualifiedTableName)
-{
     switch (m_type) {
     case StringType:
-        return "(" + qualifiedTableName + "keyString " + comparisonOperator + " ?  OR  " + qualifiedTableName + "keyString IS NULL)  AND  ";
+        return other->m_string == m_string;
     case DateType:
-        return "(" + qualifiedTableName + "keyDate " + comparisonOperator + " ? OR " + qualifiedTableName + "keyDate IS NULL)  AND  " + qualifiedTableName + "keyString IS NULL  AND  ";
+        return other->m_date == m_date;
     case NumberType:
-        return "(" + qualifiedTableName + "keyNumber " + comparisonOperator + " ? OR " + qualifiedTableName + "keyNumber IS NULL)  AND  " + qualifiedTableName + "keyString IS NULL  AND  " + qualifiedTableName + "keyDate IS NULL  AND  ";
+        return other->m_number == m_number;
     case NullType:
-        if (comparisonOperator == "<")
-            return "0 != 0  AND  ";
-        return qualifiedTableName + "keyString IS NULL  AND  " + qualifiedTableName + "keyDate IS NULL  AND  " + qualifiedTableName + "keyNumber IS NULL  AND  ";
-    }
-    ASSERT_NOT_REACHED();
-    return "";
-}
-
-// Returns the number of items bound.
-int IDBKey::bind(SQLiteStatement& query, int column) const
-{
-    switch (m_type) {
-    case IDBKey::StringType:
-        query.bindText(column, m_string);
-        return 1;
-    case IDBKey::DateType:
-        query.bindDouble(column, m_date);
-        return 1;
-    case IDBKey::NumberType:
-        query.bindDouble(column, m_number);
-        return 1;
-    case IDBKey::NullType:
-        return 0;
+        return true;
     }
 
     ASSERT_NOT_REACHED();
-    return 0;
-}
-
-void IDBKey::bindWithNulls(SQLiteStatement& query, int baseColumn) const
-{
-    switch (m_type) {
-    case IDBKey::StringType:
-        query.bindText(baseColumn + 0, m_string);
-        query.bindNull(baseColumn + 1);
-        query.bindNull(baseColumn + 2);
-        break;
-    case IDBKey::DateType:
-        query.bindNull(baseColumn + 0);
-        query.bindDouble(baseColumn + 1, m_date);
-        query.bindNull(baseColumn + 2);
-        break;
-    case IDBKey::NumberType:
-        query.bindNull(baseColumn + 0);
-        query.bindNull(baseColumn + 1);
-        query.bindDouble(baseColumn + 2, m_number);
-        break;
-    case IDBKey::NullType:
-        query.bindNull(baseColumn + 0);
-        query.bindNull(baseColumn + 1);
-        query.bindNull(baseColumn + 2);
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-    }
+    return false;
 }
 
 } // namespace WebCore