diff options
| author | Kenny Root <kenny@the-b.org> | 2009-07-08 03:25:38 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2009-07-08 03:25:38 +0000 |
| commit | 51692e27c1008021371c85bf622717a77c9f7530 (patch) | |
| tree | 0c254510690d26da2229416d29ba8ff1adce206d | |
| parent | 435fbceb68b1806c53cb0cfcebbca562758abe52 (diff) | |
| download | connectbot-51692e27c1008021371c85bf622717a77c9f7530.tar.gz connectbot-51692e27c1008021371c85bf622717a77c9f7530.tar.bz2 connectbot-51692e27c1008021371c85bf622717a77c9f7530.zip | |
Add indices and color tables to robust upgrade
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@358 df292f66-193f-0410-a5fc-6d59da041ff2
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/org/connectbot/util/HostDatabase.java | 5 | ||||
| -rw-r--r-- | src/org/connectbot/util/RobustSQLiteOpenHelper.java | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8d209f6..da3a22e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.connectbot" android:versionName="1.6-dev" - android:versionCode="163"> + android:versionCode="164"> <application android:icon="@drawable/icon" diff --git a/src/org/connectbot/util/HostDatabase.java b/src/org/connectbot/util/HostDatabase.java index 89d5455..1f13617 100644 --- a/src/org/connectbot/util/HostDatabase.java +++ b/src/org/connectbot/util/HostDatabase.java @@ -115,6 +115,11 @@ public class HostDatabase extends RobustSQLiteOpenHelper { static { addTableName(TABLE_HOSTS); addTableName(TABLE_PORTFORWARDS); + addIndexName(TABLE_PORTFORWARDS + FIELD_PORTFORWARD_HOSTID + "index"); + addTableName(TABLE_COLORS); + addIndexName(TABLE_COLORS + FIELD_COLOR_SCHEME + "index"); + addTableName(TABLE_COLOR_DEFAULTS); + addIndexName(TABLE_COLOR_DEFAULTS + FIELD_COLOR_SCHEME + "index"); } public HostDatabase(Context context) { diff --git a/src/org/connectbot/util/RobustSQLiteOpenHelper.java b/src/org/connectbot/util/RobustSQLiteOpenHelper.java index 00d37ef..b19f09d 100644 --- a/src/org/connectbot/util/RobustSQLiteOpenHelper.java +++ b/src/org/connectbot/util/RobustSQLiteOpenHelper.java @@ -34,6 +34,7 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory; */ public abstract class RobustSQLiteOpenHelper extends SQLiteOpenHelper { private static List<String> mTableNames = new LinkedList<String>(); + private static List<String> mIndexNames = new LinkedList<String>(); public RobustSQLiteOpenHelper(Context context, String name, CursorFactory factory, int version) { @@ -44,6 +45,10 @@ public abstract class RobustSQLiteOpenHelper extends SQLiteOpenHelper { mTableNames.add(tableName); } + protected static void addIndexName(String indexName) { + mIndexNames.add(indexName); + } + @Override public void onCreate(SQLiteDatabase db) { dropAllTables(db); @@ -117,6 +122,8 @@ public abstract class RobustSQLiteOpenHelper extends SQLiteOpenHelper { } private void dropAllTablesWithPrefix(SQLiteDatabase db, String prefix) { + for (String indexName : mIndexNames) + db.execSQL("DROP INDEX IF EXISTS " + prefix + indexName); for (String tableName : mTableNames) db.execSQL("DROP TABLE IF EXISTS " + prefix + tableName); } |