diff options
author | Yusuke Ohmichi(maimuzo) <maimuzo@gmail.com> | 2008-12-19 19:41:46 +0900 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2009-03-04 14:14:21 -0800 |
commit | accbadeb52eda2d972fa6d9f41ebaf9168dc343a (patch) | |
tree | 15430e7cb98543eb4ec0865542d0f2ea73152108 /core/java/android/database | |
parent | bfcb2193b3d64a0a2087d66eadf1e20f37e3addd (diff) | |
download | frameworks_base-accbadeb52eda2d972fa6d9f41ebaf9168dc343a.zip frameworks_base-accbadeb52eda2d972fa6d9f41ebaf9168dc343a.tar.gz frameworks_base-accbadeb52eda2d972fa6d9f41ebaf9168dc343a.tar.bz2 |
fix issue #1587
Diffstat (limited to 'core/java/android/database')
-rw-r--r-- | core/java/android/database/sqlite/SQLiteQueryBuilder.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/java/android/database/sqlite/SQLiteQueryBuilder.java b/core/java/android/database/sqlite/SQLiteQueryBuilder.java index 519a81c..139fcba 100644 --- a/core/java/android/database/sqlite/SQLiteQueryBuilder.java +++ b/core/java/android/database/sqlite/SQLiteQueryBuilder.java @@ -351,23 +351,26 @@ public class SQLiteQueryBuilder String groupBy, String having, String sortOrder, String limit) { String[] projection = computeProjection(projectionIn); + StringBuilder where = new StringBuilder(); + if (mWhereClause.length() > 0) { - mWhereClause.append(')'); + where.append(mWhereClause.toString()); + where.append(')'); } // Tack on the user's selection, if present. if (selection != null && selection.length() > 0) { if (mWhereClause.length() > 0) { - mWhereClause.append(" AND "); + where.append(" AND "); } - mWhereClause.append('('); - mWhereClause.append(selection); - mWhereClause.append(')'); + where.append('('); + where.append(selection); + where.append(')'); } return buildQueryString( - mDistinct, mTables, projection, mWhereClause.toString(), + mDistinct, mTables, projection, where.toString(), groupBy, having, sortOrder, limit); } |