Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix "duplicate column: maxage" (issue #445)

Browse Source 
The bug is explained in detail in the issue tracker.
This change added guard condition to check for existence of the field
before adding.

While I was at it, I also guarded a bunch of other ALTER statements
with the if (!columnExists()) check. It turns out that many of them
break, but we only saw the first one because it threw an exception
before getting to the others.
This commit is contained in:
Peter Serwylo 2014-02-20 15:29:50 +11:00
parent 8f506c0b0b
commit 3240faf7f2
1 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/org/fdroid/fdroid/data/DBHelper.java
View File

@ -120,49 +120,49 @@ public class DBHelper extends SQLiteOpenHelper {
} }
private void renameRepoId(SQLiteDatabase db, int oldVersion) { private void renameRepoId(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 36) { if (oldVersion < 36 && !columnExists(db, TABLE_REPO, "_id")) {
Log.d("FDroid", "Renaming " + TABLE_REPO + ".id to _id"); Log.d("FDroid", "Renaming " + TABLE_REPO + ".id to _id");
db.beginTransaction(); db.beginTransaction();
try { try {
// http://stackoverflow.com/questions/805363/how-do-i-rename-a-column-in-a-sqlite-database-table#805508 // http://stackoverflow.com/questions/805363/how-do-i-rename-a-column-in-a-sqlite-database-table#805508
String tempTableName = TABLE_REPO + "__temp__"; String tempTableName = TABLE_REPO + "__temp__";
db.execSQL("ALTER TABLE " + TABLE_REPO + " RENAME TO " + tempTableName + ";" ); db.execSQL("ALTER TABLE " + TABLE_REPO + " RENAME TO " + tempTableName + ";" );
// I realise this is available in the CREATE_TABLE_REPO above, // I realise this is available in the CREATE_TABLE_REPO above,
// however I have a feeling that it will need to be the same as the // however I have a feeling that it will need to be the same as the
// current structure of the table as of DBVersion 36, or else we may // current structure of the table as of DBVersion 36, or else we may
// get into strife. For example, if there was a field that // get into strife. For example, if there was a field that
// got removed, then it will break the "insert select" // got removed, then it will break the "insert select"
// statement. Therefore, I've put a copy of CREATE_TABLE_REPO // statement. Therefore, I've put a copy of CREATE_TABLE_REPO
// here that is the same as it was at DBVersion 36. // here that is the same as it was at DBVersion 36.
String createTableDdl = "create table " + TABLE_REPO + " (" String createTableDdl = "create table " + TABLE_REPO + " ("
+ "_id integer not null primary key, " + "_id integer not null primary key, "
+ "address text not null, " + "address text not null, "
+ "name text, " + "name text, "
+ "description text, " + "description text, "
+ "inuse integer not null, " + "inuse integer not null, "
+ "priority integer not null, " + "priority integer not null, "
+ "pubkey text, " + "pubkey text, "
+ "fingerprint text, " + "fingerprint text, "
+ "maxage integer not null default 0, " + "maxage integer not null default 0, "
+ "version integer not null default 0, " + "version integer not null default 0, "
+ "lastetag text, " + "lastetag text, "
+ "lastUpdated string);"; + "lastUpdated string);";
db.execSQL(createTableDdl); db.execSQL(createTableDdl);
String nonIdFields = "address, name, description, inuse, priority, " + String nonIdFields = "address, name, description, inuse, priority, " +
"pubkey, fingerprint, maxage, version, lastetag, lastUpdated"; "pubkey, fingerprint, maxage, version, lastetag, lastUpdated";
String insertSql = "INSERT INTO " + TABLE_REPO + String insertSql = "INSERT INTO " + TABLE_REPO +
"(_id, " + nonIdFields + " ) " + "(_id, " + nonIdFields + " ) " +
"SELECT id, " + nonIdFields + " FROM " + tempTableName + ";"; "SELECT id, " + nonIdFields + " FROM " + tempTableName + ";";
db.execSQL(insertSql); db.execSQL(insertSql);
db.execSQL("DROP TABLE " + tempTableName + ";"); db.execSQL("DROP TABLE " + tempTableName + ";");
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} catch (Exception e) { } catch (Exception e) {
Log.e("FDroid", "Error renaming id to _id: " + e.getMessage()); Log.e("FDroid", "Error renaming id to _id: " + e.getMessage());
} }
@ -273,10 +273,12 @@ public class DBHelper extends SQLiteOpenHelper {
* default repos with values from strings.xml. * default repos with values from strings.xml.
*/ */
private void addNameAndDescriptionToRepo(SQLiteDatabase db, int oldVersion) { private void addNameAndDescriptionToRepo(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 21) { boolean nameExists = columnExists(db, TABLE_REPO, "name");
if (!columnExists(db, TABLE_REPO, "name")) boolean descriptionExists = columnExists(db, TABLE_REPO, "description");
if (oldVersion < 21 && !(nameExists && descriptionExists)) {
if (!nameExists)
db.execSQL("alter table " + TABLE_REPO + " add column name text"); db.execSQL("alter table " + TABLE_REPO + " add column name text");
if (!columnExists(db, TABLE_REPO, "description")) if (!descriptionExists)
db.execSQL("alter table " + TABLE_REPO + " add column description text"); db.execSQL("alter table " + TABLE_REPO + " add column description text");
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put("name", context.getString(R.string.default_repo_name)); values.put("name", context.getString(R.string.default_repo_name));
@ -322,7 +324,7 @@ public class DBHelper extends SQLiteOpenHelper {
} }
private void addMaxAgeToRepo(SQLiteDatabase db, int oldVersion) { private void addMaxAgeToRepo(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 30) { if (oldVersion < 30 && !columnExists(db, TABLE_REPO, "maxage")) {
db.execSQL("alter table " + TABLE_REPO + " add column maxage integer not null default 0"); db.execSQL("alter table " + TABLE_REPO + " add column maxage integer not null default 0");
} }
} }