Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 839594df authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "People might want GROUP_CONCAT." into qt-dev 

am: 668f138c

Change-Id: Id79f6eff0a471b79f9f4ceb7886a3927a426f67d
parents 6fdb8c5b 668f138c

core/java/android/database/sqlite/SQLiteQueryBuilder.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class SQLiteQueryBuilder { 
    private static final Pattern sLimitPattern =

            Pattern.compile("\\s*\\d+\\s*(,\\s*\\d+\\s*)?");

    private static final Pattern sAggregationPattern = Pattern.compile(

            "(?i)(AVG|COUNT|MAX|MIN|SUM|TOTAL)\\((.+)\\)");

            "(?i)(AVG|COUNT|MAX|MIN|SUM|TOTAL|GROUP_CONCAT)\\((.+)\\)");



    private Map<String, String> mProjectionMap = null;

    private List<Pattern> mProjectionGreylist = null;