Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9ae8873: Merge change 617 into donut

Browse Source 
Merge commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e'

* commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e':
  Allow caller-supplied column aliases in queries even when a projection map is used.
This commit is contained in:
Android (Google) Code Review
2009-04-29 13:41:23 -07:00
committed by The Android Open Source Project
parent ef77be9526 9ae8873ed8
commit 090d32b275
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/database/sqlite/SQLiteQueryBuilder.java
View File

@@ -489,12 +489,20 @@ public class SQLiteQueryBuilder
String userColumn = projectionIn[i];
String column = mProjectionMap.get(userColumn);
if (column == null) {
throw new IllegalArgumentException(
"Invalid column " + projectionIn[i]);
} else {
if (column != null) {
projection[i] = column;
continue;
}
if (userColumn.contains(" AS ")
|| userColumn.contains(" as ")) {
/* A column alias already exist */
projection[i] = userColumn;
continue;
}
throw new IllegalArgumentException("Invalid column "
+ projectionIn[i]);
}
return projection;
} else {