commit 8a4060ec0c2433ceeb619a3a35fba5aabedbc1c6
author Tom Taylor <tomtaylor@google.com> Mon Mar 22 17:08:55 2010 -0700
committer Tom Taylor <tomtaylor@google.com> Mon Mar 22 17:08:55 2010 -0700
tree 8cb276ba72e42f09005e7bedbf1dc7cd911f9be7
parent 8105bfc94d4e63dbbc853dc4312ed480b6adc23a

Revert "Add metadata column"

This reverts commit fc0eb2f2905477c7200eb54584d2c104cd6d1adb.

Conflicts:

	src/com/android/providers/telephony/MmsSmsDatabaseHelper.java

Change-Id: Ic0dd4a602763ef643539f14c3a78afaed2b328fe

src/com/android/providers/telephony/MmsSmsDatabaseHelper.java

diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index 7d29bd3..187ee30 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -518,8 +518,7 @@
                    Mms.DELIVERY_TIME + " INTEGER," +
                    Mms.DELIVERY_REPORT + " INTEGER," +
                    Mms.LOCKED + " INTEGER DEFAULT 0," +
-                   Mms.SEEN + " INTEGER DEFAULT 0," +
-                   Mms.META_DATA + " TEXT" +
+                   Mms.SEEN + " INTEGER DEFAULT 0" +
                    ");");
 
         db.execSQL("CREATE TABLE " + MmsProvider.TABLE_ADDR + " (" +
@@ -612,8 +611,7 @@
                    "service_center TEXT," +
                    "locked INTEGER DEFAULT 0," +
                    "error_code INTEGER DEFAULT 0," +
-                   "seen INTEGER DEFAULT 0," +
-                   "meta_data TEXT" +
+                   "seen INTEGER DEFAULT 0" +
                    ");");
 
         /**
@@ -1080,17 +1078,7 @@
             if (currentVersion <= 51) {
                 return;
             }
-
-            db.beginTransaction();
-            try {
-                upgradeDatabaseToVersion52(db);
-                db.setTransactionSuccessful();
-            } catch (Throwable ex) {
-                Log.e(TAG, ex.getMessage(), ex);
-                break;
-            } finally {
-                db.endTransaction();
-            }
+            // 52 was adding a new meta_data column, but that was removed.
             // fall through
         case 52:
             if (currentVersion <= 52) {
@@ -1180,14 +1168,6 @@
         db.execSQL("ALTER TABLE pdu ADD COLUMN " + Mms.LOCKED + " INTEGER DEFAULT 0");
     }
 
-    private void upgradeDatabaseToVersion52(SQLiteDatabase db) {
-        // Add 'meta_data' column to sms table.
-        db.execSQL("ALTER TABLE sms ADD COLUMN " + Sms.META_DATA + " TEXT");
-
-        // Add 'meta_data' column to pdu table.
-        db.execSQL("ALTER TABLE pdu ADD COLUMN " + Mms.META_DATA + " TEXT");
-    }
-
     private void upgradeDatabaseToVersion53(SQLiteDatabase db) {
         db.execSQL("DROP TRIGGER IF EXISTS pdu_update_thread_read_on_update");