Skip to content

Adding an "extras" column to transport databases #578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jul 12, 2019
Merged

Adding an "extras" column to transport databases #578

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f20b6a9
Added tests for upgrade
ashwinraghav Jun 29, 2019
8f336bd
Added tests for nullability
ashwinraghav Jul 2, 2019
7179566
Modelling creates as migrations
ashwinraghav Jul 2, 2019
993ad55
Review feedback
ashwinraghav Jul 3, 2019
28cf408
Review feedbackwq
ashwinraghav Jul 3, 2019
4c14bec
Throwing exception
ashwinraghav Jul 3, 2019
70ffb73
added test
ashwinraghav Jul 3, 2019
0059906
java formatting
ashwinraghav Jul 3, 2019
23a36f1
Fixed tests
ashwinraghav Jul 3, 2019
393e32b
Apis to wire in extras (#581)
ashwinraghav Jul 12, 2019
7b77553
Review feedback
ashwinraghav Jul 12, 2019
b5deb66
Review feedback
ashwinraghav Jul 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...n/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ final class SchemaManager extends SQLiteOpenHelper {
db.execSQL("DROP INDEX contexts_backend_priority");
};

static final List<Migration> INCREMENTAL_MIGRATIONS = Arrays.asList(MIGRATE_TO_V1, MIGRATE_TO_V2);
private static final List<Migration> INCREMENTAL_MIGRATIONS =
Arrays.asList(MIGRATE_TO_V1, MIGRATE_TO_V2);

@Inject
SchemaManager(Context context, @Named("SCHEMA_VERSION") int schemaVersion) {
Expand Down Expand Up @@ -148,7 +149,7 @@ public void onOpen(SQLiteDatabase db) {

private void upgrade(SQLiteDatabase db, int fromVersion, int toVersion) {
if (toVersion > INCREMENTAL_MIGRATIONS.size()) {
throw new RuntimeException(
throw new IllegalArgumentException(
"Migration from "
+ fromVersion
+ " to "
Expand Down
9 changes: 7 additions & 2 deletions ...va/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.google.android.datatransport.runtime.time.TestClock;
import com.google.android.datatransport.runtime.time.UptimeClock;
import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
Expand Down Expand Up @@ -131,13 +132,17 @@ public void downgradeV2ToV1_withNonEmptyDB_isLossy() {
assertThat(store.loadBatch(CONTEXT1)).doesNotContain(event1);
}

@Test(expected = RuntimeException.class)
@Test
public void upgrade_toANonExistentVersion_fails() {
int oldVersion = 1;
int nonExistentVersion = 1000;
SchemaManager schemaManager = new SchemaManager(RuntimeEnvironment.application, oldVersion);

schemaManager.onUpgrade(schemaManager.getWritableDatabase(), oldVersion, nonExistentVersion);
Assert.assertThrows(
RuntimeException.class,
() ->
schemaManager.onUpgrade(
schemaManager.getWritableDatabase(), oldVersion, nonExistentVersion));
}

private PersistedEvent simulatedPersistOnV1Database(
Expand Down