This commit is contained in:
Yusuke Ohmichi(maimuzo)
2008-12-19 19:41:46 +09:00
committed by Jean-Baptiste Queru
parent bfcb2193b3
commit accbadeb52

View File

@@ -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);
}