mozilla-bmo1601707.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Tue, 07 Jan 2020 09:47:03 +0100
branchfirefox71
changeset 1118 27c3f029180a
child 1119 4c5d44d40a03
permissions -rw-r--r--
latest 71.0 revision
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1118
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
--- a/dom/indexedDB/ActorsParent.cpp
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
+++ b/dom/indexedDB/ActorsParent.cpp
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
@@ -24311,9 +24311,9 @@
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
   // if we allow overwrite or not. By not allowing overwrite we raise
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
   // detectable errors rather than corrupting data.
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
   DatabaseConnection::CachedStatement stmt;
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
-  const auto& optReplaceDirective = (!mOverwrite || keyUnset)
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
-                                        ? NS_LITERAL_CSTRING("")
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
-                                        : NS_LITERAL_CSTRING("OR REPLACE ");
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
+  const auto optReplaceDirective = (!mOverwrite || keyUnset)
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
+                                       ? NS_LITERAL_CSTRING("")
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
+                                       : NS_LITERAL_CSTRING("OR REPLACE ");
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
   rv = aConnection->GetCachedStatement(
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
       NS_LITERAL_CSTRING("INSERT ") + optReplaceDirective +
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
           NS_LITERAL_CSTRING("INTO object_data "
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
@@ -25869,7 +25869,7 @@
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
     }
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
   }
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
 
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
-  const auto& comparisonChar =
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
+  const auto comparisonChar =
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
       isIncreasingOrder ? NS_LITERAL_CSTRING(">") : NS_LITERAL_CSTRING("<");
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
 
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
   mCursor->mContinueToQuery =
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
@@ -26076,9 +26076,9 @@
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
 
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
   const bool usingKeyRange = mOptionalKeyRange.isSome();
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
 
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
-  const auto& indexTable = mCursor->mUniqueIndex
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    31
-                               ? NS_LITERAL_CSTRING("unique_index_data")
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
-                               : NS_LITERAL_CSTRING("index_data");
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
+  const auto indexTable = mCursor->mUniqueIndex
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
+                              ? NS_LITERAL_CSTRING("unique_index_data")
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
+                              : NS_LITERAL_CSTRING("index_data");
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
 
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
   NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column");
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
 
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
@@ -26198,9 +26198,9 @@
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
 
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
   const bool usingKeyRange = mOptionalKeyRange.isSome();
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
 
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
-  const auto& table = mCursor->mUniqueIndex
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
-                          ? NS_LITERAL_CSTRING("unique_index_data")
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
-                          : NS_LITERAL_CSTRING("index_data");
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
+  const auto table = mCursor->mUniqueIndex
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
+                         ? NS_LITERAL_CSTRING("unique_index_data")
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
+                         : NS_LITERAL_CSTRING("index_data");
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
 
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    50
   NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column");
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    51
 
27c3f029180a latest 71.0 revision
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    52