mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 06:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix NULL 'constraints'. For SQLite they're implicit if no NOT NULL is given.

Browse source
This commit is contained in:
Andreas Schildbach 2019-10-26 13:16:49 +02:00
parent 170eb8827d
commit 94d56c6d35
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
oeffi/src/de/schildbach/oeffi/directions/QueryHistoryProvider.java
View file

@ -468,20 +468,20 @@ public class QueryHistoryProvider extends ContentProvider {
+ KEY_FROM_ID + " TEXT, " //
+ KEY_FROM_LAT + " INTEGER NOT NULL, " //
+ KEY_FROM_LON + " INTEGER NOT NULL, " //
+ KEY_FROM_PLACE + " TEXT NULL, " //
+ KEY_FROM_PLACE + " TEXT, " //
+ KEY_FROM_NAME + " TEXT NOT NULL, " //
+ KEY_TO_TYPE + " INTEGER NOT NULL, " //
+ KEY_TO_ID + " TEXT, " //
+ KEY_TO_LAT + " INTEGER NOT NULL, " //
+ KEY_TO_LON + " INTEGER NOT NULL, " //
+ KEY_TO_PLACE + " TEXT NULL, " //
+ KEY_TO_PLACE + " TEXT, " //
+ KEY_TO_NAME + " TEXT NOT NULL, " //
+ KEY_FAVORITE + " INTEGER NULL DEFAULT 0, " //
+ KEY_FAVORITE + " INTEGER DEFAULT 0, " //
+ KEY_TIMES_QUERIED + " INTEGER NOT NULL DEFAULT 0, " //
+ KEY_LAST_QUERIED + " INTEGER NOT NULL, " // TODO NULL
+ KEY_LAST_DEPARTURE_TIME + " INTEGER NOT NULL DEFAULT 0, " //
+ KEY_LAST_ARRIVAL_TIME + " INTEGER NOT NULL DEFAULT 0, " //
+ KEY_LAST_TRIP + " BLOB NULL);";
+ KEY_LAST_TRIP + " BLOB);";
private static final String DATABASE_COLUMN_LIST = KEY_ROWID + "," + KEY_NETWORK + "," + KEY_FROM_TYPE + ","
+ KEY_FROM_ID + "," + KEY_FROM_LAT + "," + KEY_FROM_LON + "," + KEY_FROM_PLACE + "," + KEY_FROM_NAME
+ "," + KEY_TO_TYPE + "," + KEY_TO_ID + "," + KEY_TO_LAT + "," + KEY_TO_LON + "," + KEY_TO_PLACE + ","
@ -525,15 +525,15 @@ public class QueryHistoryProvider extends ContentProvider {
// removed proper migration because very few old clients left
db.execSQL("DELETE FROM " + DATABASE_TABLE);
} else if (oldVersion == 3) {
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_FROM_PLACE + " TEXT NULL");
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_TO_PLACE + " TEXT NULL");
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_FROM_PLACE + " TEXT");
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_TO_PLACE + " TEXT");
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_LAST_DEPARTURE_TIME
+ " INT NOT NULL DEFAULT 0");
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_LAST_ARRIVAL_TIME
+ " INT NOT NULL DEFAULT 0");
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_LAST_TRIP + " BLOB NULL");
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_LAST_TRIP + " BLOB");
} else if (oldVersion == 4) {
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_FAVORITE + " INTEGER NULL DEFAULT 0");
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_FAVORITE + " INTEGER DEFAULT 0");
} else if (oldVersion == 5) {
final String DATABASE_TABLE_OLD = DATABASE_TABLE + "_old";
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " RENAME TO " + DATABASE_TABLE_OLD);

6
oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsProvider.java
View file

@ -246,8 +246,8 @@ public class FavoriteStationsProvider extends ContentProvider {
+ KEY_TYPE + " INT NOT NULL DEFAULT 1, " //
+ KEY_STATION_NETWORK + " TEXT NOT NULL, " //
+ KEY_STATION_ID + " TEXT NOT NULL, " //
+ KEY_STATION_PLACE + " TEXT NULL, " //
+ KEY_STATION_NAME + " TEXT NULL, " //
+ KEY_STATION_PLACE + " TEXT, " //
+ KEY_STATION_NAME + " TEXT, " //
+ KEY_STATION_LAT + " INT NOT NULL DEFAULT 0, " //
+ KEY_STATION_LON + " INT NOT NULL DEFAULT 0, " //
+ "UNIQUE (" + KEY_STATION_NETWORK + "," + KEY_STATION_ID + "));";
@ -284,7 +284,7 @@ public class FavoriteStationsProvider extends ContentProvider {
// removed proper migration because very few old clients left
db.execSQL("DELETE FROM " + DATABASE_TABLE);
} else if (oldVersion == 3) {
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_STATION_PLACE + " TEXT NULL");
db.execSQL("ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_STATION_PLACE + " TEXT");
db.execSQL(
"ALTER TABLE " + DATABASE_TABLE + " ADD COLUMN " + KEY_STATION_LAT + " INT NOT NULL DEFAULT 0");
db.execSQL(