commit 578cf8104b525e7a01a4c2cf81eeb6a33f1e6f22
author Android (Google) Code Review <android-gerrit@google.com> Wed Jul 22 11:27:18 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 22 11:27:18 2009 -0700
tree cde93b0e5b4352b33a703078c901d30106c6ab92
parent 8d92b095daf69672e9ebb932c953b77c3afd17ee
parent aa0e47cbd6ccada9d194f39e6b4372d2d3594b38

am aa0e47cb: Merge change 8179 into donut

Merge commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38'

* commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38':
  Fix SQL generated by updateWithOnConflict()

core/java/android/database/sqlite/SQLiteDatabase.java

diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index 7d331dc..184d6dc 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -1412,8 +1412,9 @@
         StringBuilder sql = new StringBuilder(120);
         sql.append("UPDATE ");
         if (algorithm != null) {
-            sql.append(" OR ");
+            sql.append("OR ");
             sql.append(algorithm.value());
+            sql.append(" ");
         }
         
         sql.append(table);