wzray/tt9
1
0
Fork 0
Code Activity

removed some more unused code

Browse source
This commit is contained in:
sspanak 2024-12-21 17:34:02 +02:00 • committed by Dimo Karaivanov
parent 2898db0702
commit 668d079450
2 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/io/github/sspanak/tt9/db/sqlite/Migration.java
View file

@ -3,27 +3,21 @@ package io.github.sspanak.tt9.db.sqlite;
class Migration { class Migration {
static final Migration[] LIST = { static final Migration[] LIST = {
new Migration( new Migration(
"ALTER TABLE " + Tables.LANGUAGES_META + " ADD COLUMN fileHash TEXT NOT NULL DEFAULT 0", "ALTER TABLE " + Tables.LANGUAGES_META + " ADD COLUMN fileHash TEXT NOT NULL DEFAULT 0"
true
), ),
new Migration( new Migration(
"ALTER TABLE " + Tables.LANGUAGES_META + " RENAME COLUMN normalizationPending TO _delete_me_0", "ALTER TABLE " + Tables.LANGUAGES_META + " RENAME COLUMN normalizationPending TO _delete_me_0"
true
), ),
new Migration( new Migration(
"ALTER TABLE " + Tables.LANGUAGES_META + " ADD COLUMN positionsToNormalize TEXT NULL", "ALTER TABLE " + Tables.LANGUAGES_META + " ADD COLUMN positionsToNormalize TEXT NULL"
true
), ),
new Migration( new Migration(
"ALTER TABLE " + Tables.LANGUAGES_META + " ADD COLUMN maxWordsPerSequence INTEGER NOT NULL DEFAULT -1", "ALTER TABLE " + Tables.LANGUAGES_META + " ADD COLUMN maxWordsPerSequence INTEGER NOT NULL DEFAULT -1"
true
) )
}; };
final String query; final String query;
final boolean mayFail; private Migration(String query) {
private Migration(String query, boolean mayFail) {
this.query = query; this.query = query;
this.mayFail = mayFail;
} }
} }

5
app/src/main/java/io/github/sspanak/tt9/db/sqlite/SQLiteOpener.java
View file

@ -61,12 +61,7 @@ public class SQLiteOpener extends SQLiteOpenHelper {
db.execSQL(migration.query); db.execSQL(migration.query);
Logger.d(LOG_TAG, "Migration succeeded: '" + migration.query); Logger.d(LOG_TAG, "Migration succeeded: '" + migration.query);
} catch (Exception e) { } catch (Exception e) {
if (migration.mayFail) {
Logger.e(LOG_TAG, "Ignoring migration: '" + migration.query + "'. "); Logger.e(LOG_TAG, "Ignoring migration: '" + migration.query + "'. ");
} else {
Logger.e(LOG_TAG, "Migration failed: '" + migration.query + "'. " + e.getMessage() + "\nAborting all subsequent migrations.");
break;
}
} }
} }
} }