Remove the "unique" requirement for serverId; it should never have been there

* People using multiple accounts without this change could end up with missing folders
* Fixes 2099514
* Database version incremented; this change will cause a database wipe

Change-Id: I08d23fa54d8194758e1f7c2ffb528a14bc184f08
This commit is contained in:
Marc Blank 2009-09-03 16:42:20 -07:00
parent 5768ef614b
commit 9be10e62ed

View File

@ -57,7 +57,7 @@ public class EmailProvider extends ContentProvider {
// Any changes to the database format *must* include update-in-place code.
public static final int DATABASE_VERSION = 2;
public static final int DATABASE_VERSION = 3;
public static final int BODY_DATABASE_VERSION = 2;
public static final String EMAIL_AUTHORITY = "com.android.email.provider";
@ -416,7 +416,7 @@ public class EmailProvider extends ContentProvider {
static void createMailboxTable(SQLiteDatabase db) {
String s = " (" + EmailContent.RECORD_ID + " integer primary key autoincrement, "
+ MailboxColumns.DISPLAY_NAME + " text, "
+ MailboxColumns.SERVER_ID + " text unique on conflict replace, "
+ MailboxColumns.SERVER_ID + " text, "
+ MailboxColumns.PARENT_SERVER_ID + " text, "
+ MailboxColumns.ACCOUNT_KEY + " integer, "
+ MailboxColumns.TYPE + " integer, "