diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-22 11:27:18 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-22 11:27:18 -0700 |
commit | 578cf8104b525e7a01a4c2cf81eeb6a33f1e6f22 (patch) | |
tree | cde93b0e5b4352b33a703078c901d30106c6ab92 /core/java/android/database | |
parent | 8d92b095daf69672e9ebb932c953b77c3afd17ee (diff) | |
parent | aa0e47cbd6ccada9d194f39e6b4372d2d3594b38 (diff) | |
download | frameworks_base-578cf8104b525e7a01a4c2cf81eeb6a33f1e6f22.zip frameworks_base-578cf8104b525e7a01a4c2cf81eeb6a33f1e6f22.tar.gz frameworks_base-578cf8104b525e7a01a4c2cf81eeb6a33f1e6f22.tar.bz2 |
am aa0e47cb: Merge change 8179 into donut
Merge commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38'
* commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38':
Fix SQL generated by updateWithOnConflict()
Diffstat (limited to 'core/java/android/database')
-rw-r--r-- | core/java/android/database/sqlite/SQLiteDatabase.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ public class SQLiteDatabase extends SQLiteClosable { 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); |