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

Commit c43acd30 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "GROUP BY and HAVING aren't ready to be strict."

parents d481b53d bba22006

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

+2 −2
Original line number Diff line number Diff line
@@ -549,8 +549,8 @@ public class SQLiteQueryBuilder { 
            // "expr" inside that need to be validated

            final String sql = buildQuery(projection,

                    wrap(queryArgs.getString(QUERY_ARG_SQL_SELECTION)),

                    wrap(queryArgs.getString(QUERY_ARG_SQL_GROUP_BY)),

                    wrap(queryArgs.getString(QUERY_ARG_SQL_HAVING)),

                    queryArgs.getString(QUERY_ARG_SQL_GROUP_BY),

                    queryArgs.getString(QUERY_ARG_SQL_HAVING),

                    queryArgs.getString(QUERY_ARG_SQL_SORT_ORDER),

                    queryArgs.getString(QUERY_ARG_SQL_LIMIT));

            db.validateSql(sql, cancellationSignal); // will throw if query is invalid