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

Commit 949c3485 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android Git Automerger
Browse files

am 13932d85: am 5304d8fd: Merge "Introducing "strict project map"." into froyo 

Merge commit '13932d85' into kraken

* commit '13932d85':
  Introducing "strict project map".
parents 7322b9f0 13932d85

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

+10 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ public class SQLiteQueryBuilder 
    private StringBuilder mWhereClause = null;  // lazily created

    private boolean mDistinct;

    private SQLiteDatabase.CursorFactory mFactory;

    private boolean mStrictProjectionMap;



    public SQLiteQueryBuilder() {

        mDistinct = false;
@@ -143,6 +144,13 @@ public class SQLiteQueryBuilder 
        mFactory = factory;

    }



    /**

     * @hide

     */

    public void setStrictProjectionMap(boolean flag) {

        mStrictProjectionMap = flag;

    }



    /**

     * Build an SQL query string from the given clauses.

     *
@@ -505,8 +513,8 @@ public class SQLiteQueryBuilder 
                        continue;

                    }



                    if (userColumn.contains(" AS ")

                            || userColumn.contains(" as ")) {

                    if (!mStrictProjectionMap &&

                            ( userColumn.contains(" AS ") || userColumn.contains(" as "))) {

                        /* A column alias already exist */

                        projection[i] = userColumn;

                        continue;