diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-22 05:02:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-22 05:02:53 -0700 |
| commit | aa0e47cbd6ccada9d194f39e6b4372d2d3594b38 (patch) | |
| tree | 71fb9d10330ef9161b3ead71d01074b3ef9e53ba /core/java/android/database | |
| parent | dfca0ee879a6cb14bcdabf34962dcec3b34a40b3 (diff) | |
| parent | 7f4c2ea378b98162fd7d3740293cfb2dfecbfc90 (diff) | |
| download | frameworks_base-aa0e47cbd6ccada9d194f39e6b4372d2d3594b38.zip frameworks_base-aa0e47cbd6ccada9d194f39e6b4372d2d3594b38.tar.gz frameworks_base-aa0e47cbd6ccada9d194f39e6b4372d2d3594b38.tar.bz2 | |
Merge change 8179 into donut
* changes:
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); |