commit c345fa41d140d1b89b4636dca6ac1d305f7c8e6a
author Mike Lockwood <lockwood@android.com> Wed Aug 05 10:18:19 2009 -0400
committer Mike Lockwood <lockwood@android.com> Wed Aug 05 10:25:57 2009 -0400
tree 9ae63ee1e452f9834bbe821b839d6578aa0bec5a
parent e7c19a079df0ba9be2fbba494ba6efd838658f78

Ignore duplicate column exceptions during database upgrade

Some columns were accidentally removed and readded, so in some upgrade
cases, the column might already exist.

Signed-off-by: Mike Lockwood <lockwood@android.com>

src/com/android/providers/contacts/ContactsProvider.java

diff --git a/src/com/android/providers/contacts/ContactsProvider.java b/src/com/android/providers/contacts/ContactsProvider.java
index 6861287..8d72f05 100644
--- a/src/com/android/providers/contacts/ContactsProvider.java
+++ b/src/com/android/providers/contacts/ContactsProvider.java
@@ -387,13 +387,41 @@
         }
 
         if (oldVersion == 82) {
-            db.execSQL("ALTER TABLE people ADD COLUMN _sync_account_type TEXT;");
-            db.execSQL("ALTER TABLE _deleted_people ADD COLUMN _sync_account_type TEXT;");
-            db.execSQL("ALTER TABLE groups ADD COLUMN _sync_account_type TEXT;");
-            db.execSQL("ALTER TABLE _deleted_groups ADD COLUMN _sync_account_type TEXT;");
-            db.execSQL("ALTER TABLE settings ADD COLUMN _sync_account_type TEXT;");
-            db.execSQL("ALTER TABLE photos ADD COLUMN _sync_account_type TEXT;");
-            db.execSQL("ALTER TABLE groupmembership ADD COLUMN group_sync_account_type TEXT;");
+            try {
+                db.execSQL("ALTER TABLE people ADD COLUMN _sync_account_type TEXT;");
+            } catch (SQLException e) {
+                // in some upgrade paths, these column might already exists
+            }
+            try {
+                db.execSQL("ALTER TABLE _deleted_people ADD COLUMN _sync_account_type TEXT;");
+            } catch (SQLException e) {
+                // in some upgrade paths, these column might already exists
+            }
+            try {
+                db.execSQL("ALTER TABLE groups ADD COLUMN _sync_account_type TEXT;");
+            } catch (SQLException e) {
+                // in some upgrade paths, these column might already exists
+            }
+            try {
+                db.execSQL("ALTER TABLE _deleted_groups ADD COLUMN _sync_account_type TEXT;");
+            } catch (SQLException e) {
+                // in some upgrade paths, these column might already exists
+            }
+            try {
+                db.execSQL("ALTER TABLE settings ADD COLUMN _sync_account_type TEXT;");
+            } catch (SQLException e) {
+                // in some upgrade paths, these column might already exists
+            }
+            try {
+                db.execSQL("ALTER TABLE photos ADD COLUMN _sync_account_type TEXT;");
+            } catch (SQLException e) {
+                // in some upgrade paths, these column might already exists
+            }
+            try {
+                db.execSQL("ALTER TABLE groupmembership ADD COLUMN group_sync_account_type TEXT;");
+            } catch (SQLException e) {
+                // in some upgrade paths, these column might already exists
+            }
 
             db.execSQL("UPDATE people"
                     + " SET _sync_account_type='com.google.GAIA'"