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

Commit 13932d85 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android Git Automerger
Browse files

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

Merge commit '5304d8fd' into froyo-plus-aosp

* commit '5304d8fd':
  Introducing "strict project map".
parents 2ef6e442 5304d8fd

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

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

    private StringBuilder mWhereClause = null;  // lazily created

    private boolean mDistinct;

    private boolean mDistinct;

    private SQLiteDatabase.CursorFactory mFactory;

    private SQLiteDatabase.CursorFactory mFactory;

    private boolean mStrictProjectionMap;





    public SQLiteQueryBuilder() {

    public SQLiteQueryBuilder() {

        mDistinct = false;

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

        mFactory = factory;

    }

    }





    /**

     * @hide

     */

    public void setStrictProjectionMap(boolean flag) {

        mStrictProjectionMap = flag;

    }



    /**

    /**

     * Build an SQL query string from the given clauses.

     * Build an SQL query string from the given clauses.

     *

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

                        continue;

                    }

                    }





                    if (userColumn.contains(" AS ")

                    if (!mStrictProjectionMap &&

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

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

                        /* A column alias already exist */

                        /* A column alias already exist */

                        projection[i] = userColumn;

                        projection[i] = userColumn;

                        continue;

                        continue;