Skip to content

Commit 4e0b941

Browse files
ashwinraghavashwinraghav
committed
Modelling creates as migrations
1 parent 8f336bd commit 4e0b941

File tree

9 files changed

+135
-465
lines changed

9 files changed

+135
-465
lines changed

‎transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/SpyEventStoreModule.java

Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,12 @@
1414

1515
package com.google.android.datatransport.runtime.scheduling.persistence;
1616

17-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_CONTEXTS_SQL_V2;
18-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_CONTEXT_BACKEND_PRIORITY_EXTRAS_INDEX_V2;
19-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENTS_SQL_V2;
20-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENT_BACKEND_INDEX_V2;
21-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENT_METADATA_SQL_V2;
22-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.DROP_CONTEXTS_SQL;
23-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.DROP_EVENTS_SQL;
24-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.DROP_EVENT_METADATA_SQL;
25-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.MIGRATE_TO_V2;
2617
import static org.mockito.Mockito.spy;
2718

2819
import com.google.android.datatransport.runtime.synchronization.SynchronizationGuard;
2920
import dagger.Binds;
3021
import dagger.Module;
3122
import dagger.Provides;
32-
import java.util.Collections;
3323
import javax.inject.Named;
3424
import javax.inject.Singleton;
3525

@@ -50,55 +40,8 @@ static EventStore eventStore(SQLiteEventStore store) {
5040
abstract SynchronizationGuard synchronizationGuard(SQLiteEventStore store);
5141

5242
@Provides
53-
@Named("CREATE_EVENTS_SQL")
54-
static String createEventsSql() {
55-
return CREATE_EVENTS_SQL_V2;
56-
}
57-
58-
@Provides
59-
@Named("CREATE_EVENT_METADATA_SQL")
60-
static String createEventMetadataSql() {
61-
return CREATE_EVENT_METADATA_SQL_V2;
62-
}
63-
64-
@Provides
65-
@Named("CREATE_CONTEXTS_SQL")
66-
static String createContextsSql() {
67-
return CREATE_CONTEXTS_SQL_V2;
68-
}
69-
70-
@Provides
71-
@Named("CREATE_EVENT_BACKEND_INDEX")
72-
static String getCreateEventBackendIndex() {
73-
return CREATE_EVENT_BACKEND_INDEX_V2;
74-
}
75-
76-
@Provides
77-
@Named("CREATE_CONTEXT_BACKEND_PRIORITY_INDEX")
78-
static String createEventBackendPriorityIndex() {
79-
return CREATE_CONTEXT_BACKEND_PRIORITY_EXTRAS_INDEX_V2;
80-
}
81-
82-
@Provides
83-
@Named("DROP_EVENTS_SQL")
84-
static String dropEventsSQL() {
85-
return DROP_EVENTS_SQL;
86-
}
87-
88-
@Provides
89-
@Named("DROP_EVENT_METADATA_SQL")
90-
static String dropEventMetadataSql() {
91-
return DROP_EVENT_METADATA_SQL;
92-
}
93-
94-
@Provides
95-
@Named("DROP_CONTEXTS_SQL")
96-
static String dropContextsSql() {
97-
return DROP_CONTEXTS_SQL;
98-
}
99-
100-
@Provides
101-
static DatabaseMigrationClient createDatabaseMigrationClient() {
102-
return new DatabaseMigrationClient(Collections.singletonList(MIGRATE_TO_V2));
43+
@Named("SCHEMA_VERSION")
44+
static int schemaVersion() {
45+
return SchemaManager.SCHEMA_VERSION;
10346
}
10447
}

‎transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/TestEventStoreModule.java

Lines changed: 4 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,12 @@
1414

1515
package com.google.android.datatransport.runtime.scheduling.persistence;
1616

17-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_CONTEXTS_SQL_V2;
18-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_CONTEXT_BACKEND_PRIORITY_EXTRAS_INDEX_V2;
19-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENTS_SQL_V2;
20-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENT_BACKEND_INDEX_V2;
21-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENT_METADATA_SQL_V2;
22-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.DROP_CONTEXTS_SQL;
23-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.DROP_EVENTS_SQL;
24-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.DROP_EVENT_METADATA_SQL;
25-
import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.MIGRATE_TO_V2;
17+
import static com.google.android.datatransport.runtime.scheduling.persistence.SchemaManager.SCHEMA_VERSION;
2618

2719
import com.google.android.datatransport.runtime.synchronization.SynchronizationGuard;
2820
import dagger.Binds;
2921
import dagger.Module;
3022
import dagger.Provides;
31-
import java.util.Collections;
3223
import javax.inject.Named;
3324

3425
@Module
@@ -54,55 +45,8 @@ static EventStoreConfig storeConfig() {
5445
abstract SynchronizationGuard synchronizationGuard(SQLiteEventStore store);
5546

5647
@Provides
57-
@Named("CREATE_EVENTS_SQL")
58-
static String createEventsSql() {
59-
return CREATE_EVENTS_SQL_V2;
60-
}
61-
62-
@Provides
63-
@Named("CREATE_EVENT_METADATA_SQL")
64-
static String createEventMetadataSql() {
65-
return CREATE_EVENT_METADATA_SQL_V2;
66-
}
67-
68-
@Provides
69-
@Named("CREATE_CONTEXTS_SQL")
70-
static String createContextsSql() {
71-
return CREATE_CONTEXTS_SQL_V2;
72-
}
73-
74-
@Provides
75-
@Named("CREATE_EVENT_BACKEND_INDEX")
76-
static String getCreateEventBackendIndex() {
77-
return CREATE_EVENT_BACKEND_INDEX_V2;
78-
}
79-
80-
@Provides
81-
@Named("CREATE_CONTEXT_BACKEND_PRIORITY_INDEX")
82-
static String createEventBackendPriorityIndex() {
83-
return CREATE_CONTEXT_BACKEND_PRIORITY_EXTRAS_INDEX_V2;
84-
}
85-
86-
@Provides
87-
@Named("DROP_EVENTS_SQL")
88-
static String dropEventsSQL() {
89-
return DROP_EVENTS_SQL;
90-
}
91-
92-
@Provides
93-
@Named("DROP_EVENT_METADATA_SQL")
94-
static String dropEventMetadataSql() {
95-
return DROP_EVENT_METADATA_SQL;
96-
}
97-
98-
@Provides
99-
@Named("DROP_CONTEXTS_SQL")
100-
static String dropContextsSql() {
101-
return DROP_CONTEXTS_SQL;
102-
}
103-
104-
@Provides
105-
static DatabaseMigrationClient createDatabaseMigrationClient() {
106-
return new DatabaseMigrationClient(Collections.singletonList(MIGRATE_TO_V2));
48+
@Named("SCHEMA_VERSION")
49+
static int schemaVersion() {
50+
return SCHEMA_VERSION;
10751
}
10852
}

‎transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/DatabaseBootstrapClient.java

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/DatabaseMigrationClient.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)