demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'composite-key-dao'

Browse Source
This commit is contained in:
Andreas Shimokawa
2016-08-18 20:35:56 +02:00
parent 6e98defe94 4ddbbfdfb0
commit ce8af615d1
10 changed files with 21 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GBDaoGenerator/build.gradle
+2 -1
View File
@@ -7,7 +7,8 @@ archivesBaseName = 'gadgetbridge-daogenerator'
dependencies {
// compile 'org.greenrobot:greendao-generator:2.2.0'
compile 'com.github.freeyourgadget:greendao:c3830951e5dd3d1e63d7bac600d5f773b81df363'
// compile project(":DaoGenerator")
compile 'com.github.freeyourgadget:greendao:1998d7cd2d21f662c6044f6ccf3b3a251bbad341'
}
sourceSets {
GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+9 -31
View File
@@ -34,7 +34,7 @@ public class GBDaoGenerator {
private static final String VALID_BY_DATE = MODEL_PACKAGE + ".ValidByDate";
public static void main(String[] args) throws Exception {
Schema schema = new Schema(12, MAIN_PACKAGE + ".entities");
Schema schema = new Schema(13, MAIN_PACKAGE + ".entities");
addActivityDescription(schema);
@@ -137,7 +137,6 @@ public class GBDaoGenerator {
activitySample.addIntProperty("rawIntensity").notNull();
activitySample.addIntProperty("steps").notNull();
activitySample.addIntProperty("rawKind").notNull();
addCommonActivitySampleProperties2(activitySample, user, device);
addHeartRateProperties(activitySample);
return activitySample;
}
@@ -149,7 +148,6 @@ public class GBDaoGenerator {
private static Entity addPebbleHealthActivitySample(Schema schema, Entity user, Entity device) {
Entity activitySample = addEntity(schema, "PebbleHealthActivitySample");
addCommonActivitySampleProperties("AbstractPebbleHealthActivitySample", activitySample, user, device);
addCommonActivitySampleProperties2(activitySample, user, device);
activitySample.addByteArrayProperty("rawPebbleHealthData");
activitySample.addIntProperty("rawIntensity").notNull();
activitySample.addIntProperty("steps").notNull();
@@ -158,31 +156,22 @@ public class GBDaoGenerator {
private static Entity addPebbleHealthActivityKindOverlay(Schema schema, Entity user, Entity device) {
Entity activityOverlay = addEntity(schema, "PebbleHealthActivityOverlay");
activityOverlay.addIdProperty();
activityOverlay.addIntProperty("timestampFrom").notNull().primaryKey();
activityOverlay.addIntProperty("timestampTo").notNull().primaryKey();
Property deviceId = activityOverlay.addLongProperty("deviceId").primaryKey().getProperty();
activityOverlay.addToOne(device, deviceId);
Property userId = activityOverlay.addLongProperty("userId").getProperty();
activityOverlay.addToOne(user, userId);
Property deviceId = activityOverlay.addLongProperty("deviceId").getProperty();
activityOverlay.addToOne(device, deviceId);
Property timestampFrom = activityOverlay.addIntProperty("timestampFrom").notNull().getProperty();
Property timestampTo = activityOverlay.addIntProperty("timestampTo").notNull().getProperty();
activityOverlay.addIntProperty("rawKind").notNull();
Index indexUnique = new Index();
indexUnique.addProperty(deviceId);
indexUnique.addProperty(timestampFrom);
indexUnique.addProperty(timestampTo);
indexUnique.makeUnique();
activityOverlay.addIndex(indexUnique);
return activityOverlay;
}
private static Entity addPebbleMisfitActivitySample(Schema schema, Entity user, Entity device) {
Entity activitySample = addEntity(schema, "PebbleMisfitSample");
addCommonActivitySampleProperties("AbstractPebbleMisfitActivitySample", activitySample, user, device);
addCommonActivitySampleProperties2(activitySample, user, device);
activitySample.addIntProperty("rawPebbleMisfitSample").notNull();
return activitySample;
}
@@ -190,7 +179,6 @@ public class GBDaoGenerator {
private static Entity addPebbleMorpheuzActivitySample(Schema schema, Entity user, Entity device) {
Entity activitySample = addEntity(schema, "PebbleMorpheuzSample");
addCommonActivitySampleProperties("AbstractPebbleMorpheuzActivitySample", activitySample, user, device);
addCommonActivitySampleProperties2(activitySample, user, device);
activitySample.addIntProperty("rawIntensity").notNull();
return activitySample;
}
@@ -202,21 +190,11 @@ public class GBDaoGenerator {
"This class represents a sample specific to the device. Values like activity kind or\n" +
"intensity, are device specific. Normalized values can be retrieved through the\n" +
"corresponding {@link SampleProvider}.");
activitySample.addIdProperty();
activitySample.addIntProperty("timestamp").notNull();
}
private static void addCommonActivitySampleProperties2(Entity activitySample, Entity user, Entity device) {
activitySample.addIntProperty("timestamp").notNull().primaryKey();
Property deviceId = activitySample.addLongProperty("deviceId").primaryKey().getProperty();
activitySample.addToOne(device, deviceId);
Property userId = activitySample.addLongProperty("userId").getProperty();
activitySample.addToOne(user, userId);
Property deviceId = activitySample.addLongProperty("deviceId").getProperty();
activitySample.addToOne(device, deviceId);
Index indexUnique = new Index();
indexUnique.addProperty(findProperty(activitySample, "timestamp"));
indexUnique.addProperty(deviceId);
indexUnique.makeUnique();
activitySample.addIndex(indexUnique);
}
private static Property findProperty(Entity entity, String propertyName) {