Skip to content
This repository was archived by the owner on Dec 11, 2021. It is now read-only.

Commit b86fbe8

Browse files
author
Frederic Julian
committed
add possibility to specify conflict resolution (default to ignore)
1 parent 3c4bebd commit b86fbe8

File tree

8 files changed

+178
-29
lines changed

8 files changed

+178
-29
lines changed

‎android-query-preprocessor/src/main/java/net/frju/androidquery/preprocessor/processor/freemarker/method/AssembleCreateTableMethod.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private String buildCreateTableStatement(DbModel dbModel, List<DbModel> dbModels
6969
for (int uniqueGroup : uniqueGroups.keySet()) {
7070
statementBuilder.append("UNIQUE(")
7171
.append(StringUtils.join(uniqueGroups.get(uniqueGroup), ","))
72-
.append(") ON CONFLICT IGNORE,");
72+
.append("),");
7373
}
7474

7575
for (ForeignKey foreignKey : dbModel.getForeignKeys()) {

‎android-query/src/main/java/net/frju/androidquery/database/BaseContentDatabaseProvider.java

+12-3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public BaseContentDatabaseProvider(@NonNull Context context) {
4242
mContentResolver = context.getContentResolver();
4343
}
4444

45+
@Override
4546
public
4647
@NonNull
4748
Uri getUri(@NonNull Class model, @Nullable String uriSuffix) {
@@ -53,6 +54,7 @@ Uri getUri(@NonNull Class model, @Nullable String uriSuffix) {
5354
}
5455
}
5556

57+
@Override
5658
public
5759
@NonNull
5860
Uri getUri(@NonNull String modelDbName, @Nullable String uriSuffix) {
@@ -63,7 +65,8 @@ Uri getUri(@NonNull String modelDbName, @Nullable String uriSuffix) {
6365
}
6466
}
6567

66-
protected long insert(@NonNull String tableName, @NonNull ContentValues values) {
68+
@Override
69+
protected long insert(@NonNull String tableName, @NonNull ContentValues values, @NonNull Query.ConflictResolution conflictResolution) {
6770
Uri resultUri = mContentResolver.insert(getUri(tableName, null), values);
6871

6972
try {
@@ -73,11 +76,13 @@ protected long insert(@NonNull String tableName, @NonNull ContentValues values)
7376
}
7477
}
7578

76-
protected int bulkInsert(@NonNull String tableName, @NonNull ContentValues[] valuesArray) {
79+
@Override
80+
protected int bulkInsert(@NonNull String tableName, @NonNull ContentValues[] valuesArray, @NonNull Query.ConflictResolution conflictResolution) {
7781
return mContentResolver.bulkInsert(getUri(tableName, null), valuesArray);
7882
}
7983

80-
protected int bulkUpdate(@NonNull String tableName, @Nullable String uriSuffix, @NonNull ContentValues[] valuesArray, @NonNull Where[][] conditionsArray) {
84+
@Override
85+
protected int bulkUpdate(@NonNull String tableName, @Nullable String uriSuffix, @NonNull ContentValues[] valuesArray, @NonNull Where[][] conditionsArray, @NonNull Query.ConflictResolution conflictResolution) {
8186
int nbUpdate = 0;
8287

8388
for (int i = 0; i < valuesArray.length; i++) {
@@ -91,6 +96,7 @@ protected int bulkUpdate(@NonNull String tableName, @Nullable String uriSuffix,
9196
return nbUpdate;
9297
}
9398

99+
@Override
94100
protected
95101
@Nullable
96102
Cursor query(@NonNull String tableName, @NonNull String[] columns, @Nullable Where[] where, @Nullable Join[] joins,
@@ -115,6 +121,7 @@ Cursor query(@NonNull String tableName, @NonNull String[] columns, @Nullable Whe
115121
}
116122
}
117123

124+
@Override
118125
protected int delete(@NonNull String tableName, @Nullable String uriSuffix, @Nullable Where[] where) {
119126
return mContentResolver.delete(
120127
getUri(tableName, uriSuffix),
@@ -123,6 +130,7 @@ protected int delete(@NonNull String tableName, @Nullable String uriSuffix, @Nul
123130
);
124131
}
125132

133+
@Override
126134
protected long count(@NonNull String tableName, @Nullable Where[] where) {
127135
Cursor c = null;
128136

@@ -161,6 +169,7 @@ protected long count(@NonNull String tableName, @Nullable Where[] where) {
161169
}
162170
}
163171

172+
@Override
164173
protected
165174
@Nullable
166175
Cursor rawQuery(@NonNull String sql) {

‎android-query/src/main/java/net/frju/androidquery/database/BaseLocalDatabaseProvider.java

+33-7
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ String getAuthority() {
133133
return getClass().getPackage().getName();
134134
}
135135

136+
@Override
136137
public
137138
@NonNull
138139
Uri getUri(@NonNull Class model, @Nullable String uriSuffix) {
@@ -144,6 +145,7 @@ Uri getUri(@NonNull Class model, @Nullable String uriSuffix) {
144145
}
145146
}
146147

148+
@Override
147149
public
148150
@NonNull
149151
Uri getUri(@NonNull String modelDbName, @Nullable String uriSuffix) {
@@ -229,8 +231,9 @@ protected void onUpgrade(@NonNull SQLiteDatabase db, int oldVersion, int newVers
229231
protected void onPostUpgrade(int oldVersion, int newVersion) {
230232
}
231233

232-
protected long insert(@NonNull String tableName, @NonNull ContentValues values) {
233-
long newId = mDatabase.insert(tableName, null, values);
234+
@Override
235+
protected long insert(@NonNull String tableName, @NonNull ContentValues values, @NonNull Query.ConflictResolution conflictResolution) {
236+
long newId = mDatabase.insertWithOnConflict(tableName, null, values, convertEnum(conflictResolution));
234237

235238
if (newId != -1) {
236239
mContext.getContentResolver().notifyChange(getUri(tableName, null), null);
@@ -239,13 +242,14 @@ protected long insert(@NonNull String tableName, @NonNull ContentValues values)
239242
return newId;
240243
}
241244

242-
protected int bulkInsert(@NonNull String tableName, @NonNull ContentValues[] valuesArray) {
245+
@Override
246+
protected int bulkInsert(@NonNull String tableName, @NonNull ContentValues[] valuesArray, @NonNull Query.ConflictResolution conflictResolution) {
243247
int nbInsert = 0;
244248
mDatabase.beginTransaction();
245249

246250
try {
247251
for (ContentValues values : valuesArray) {
248-
if (mDatabase.insert(tableName, null, values) != -1) {
252+
if (mDatabase.insertWithOnConflict(tableName, null, values, convertEnum(conflictResolution)) != -1) {
249253
nbInsert++;
250254
}
251255
}
@@ -262,17 +266,19 @@ protected int bulkInsert(@NonNull String tableName, @NonNull ContentValues[] val
262266
return nbInsert;
263267
}
264268

265-
protected int bulkUpdate(@NonNull String tableName, @Nullable String uriSuffix, @NonNull ContentValues[] valuesArray, @NonNull Where[][] conditionsArray) {
269+
@Override
270+
protected int bulkUpdate(@NonNull String tableName, @Nullable String uriSuffix, @NonNull ContentValues[] valuesArray, @NonNull Where[][] conditionsArray, @NonNull Query.ConflictResolution conflictResolution) {
266271
int nbUpdate = 0;
267272
mDatabase.beginTransaction();
268273

269274
try {
270275
for (int i = 0; i < valuesArray.length; i++) {
271-
nbUpdate += mDatabase.update(
276+
nbUpdate += mDatabase.updateWithOnConflict(
272277
tableName,
273278
valuesArray[i],
274279
mClauseHelper.getCondition(conditionsArray[i]),
275-
mClauseHelper.getConditionArgs(conditionsArray[i])
280+
mClauseHelper.getConditionArgs(conditionsArray[i]),
281+
convertEnum(conflictResolution)
276282
);
277283
}
278284

@@ -288,6 +294,7 @@ protected int bulkUpdate(@NonNull String tableName, @Nullable String uriSuffix,
288294
return nbUpdate;
289295
}
290296

297+
@Override
291298
protected
292299
@Nullable
293300
Cursor query(@NonNull String tableName, @NonNull String[] columns, @Nullable Where[] where, @Nullable Join[] joins,
@@ -329,6 +336,7 @@ Cursor query(@NonNull String tableName, @NonNull String[] columns, @Nullable Whe
329336
}
330337
}
331338

339+
@Override
332340
protected int delete(@NonNull String tableName, @Nullable String uriSuffix, @Nullable Where[] where) {
333341
String whereClause = mClauseHelper.getCondition(where);
334342
int nbDeleted = mDatabase.delete(
@@ -344,6 +352,7 @@ protected int delete(@NonNull String tableName, @Nullable String uriSuffix, @Nul
344352
return nbDeleted;
345353
}
346354

355+
@Override
347356
protected long count(@NonNull String tableName, @Nullable Where[] where) {
348357
return DatabaseUtils.queryNumEntries(
349358
mDatabase,
@@ -353,6 +362,7 @@ protected long count(@NonNull String tableName, @Nullable Where[] where) {
353362
);
354363
}
355364

365+
@Override
356366
protected
357367
@Nullable
358368
Cursor rawQuery(@NonNull String sql) {
@@ -363,4 +373,20 @@ Cursor rawQuery(@NonNull String sql) {
363373
SQLiteDatabase getDatabase() {
364374
return mDatabase;
365375
}
376+
377+
private int convertEnum(Query.ConflictResolution conflictResolution) {
378+
switch (conflictResolution) {
379+
case CONFLICT_ABORT:
380+
return SQLiteDatabase.CONFLICT_ABORT;
381+
case CONFLICT_FAIL:
382+
return SQLiteDatabase.CONFLICT_FAIL;
383+
case CONFLICT_REPLACE:
384+
return SQLiteDatabase.CONFLICT_REPLACE;
385+
case CONFLICT_ROLLBACK:
386+
return SQLiteDatabase.CONFLICT_ROLLBACK;
387+
default:
388+
case CONFLICT_IGNORE:
389+
return SQLiteDatabase.CONFLICT_IGNORE;
390+
}
391+
}
366392
}

‎android-query/src/main/java/net/frju/androidquery/database/DatabaseProvider.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ protected DatabaseProvider(@NonNull Context context) {
5555
@NonNull
5656
Uri getUri(@NonNull String modelDbName, @Nullable String uriSuffix);
5757

58-
abstract protected long insert(@NonNull String tableName, @NonNull ContentValues valuesArray);
58+
abstract protected long insert(@NonNull String tableName, @NonNull ContentValues valuesArray, @NonNull Query.ConflictResolution conflictResolution);
5959

60-
abstract protected int bulkInsert(@NonNull String tableName, @NonNull ContentValues[] valuesArray);
60+
abstract protected int bulkInsert(@NonNull String tableName, @NonNull ContentValues[] valuesArray, @NonNull Query.ConflictResolution conflictResolution);
6161

62-
abstract protected int bulkUpdate(@NonNull String tableName, @Nullable String uriSuffix, @NonNull ContentValues[] valuesArray, @NonNull Where[][] conditionsArray);
62+
abstract protected int bulkUpdate(@NonNull String tableName, @Nullable String uriSuffix, @NonNull ContentValues[] valuesArray, @NonNull Where[][] conditionsArray, @NonNull Query.ConflictResolution conflictResolution);
6363

6464
abstract protected Cursor query(@NonNull String tableName, @NonNull String[] columns, @Nullable Where[] where, @Nullable Join[] joins,
6565
@Nullable String groupBy, @Nullable String having, @Nullable OrderBy[] orderBy, @Nullable Limit limit);

‎android-query/src/main/java/net/frju/androidquery/database/Query.java

+63-6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,56 @@
2929

3030
public abstract class Query {
3131

32+
public enum ConflictResolution {
33+
/**
34+
* When a constraint violation occurs, an immediate ROLLBACK occurs,
35+
* thus ending the current transaction, and the command aborts with a
36+
* return code of SQLITE_CONSTRAINT. If no transaction is active
37+
* (other than the implied transaction that is created on every command)
38+
* then this algorithm works the same as ABORT.
39+
*/
40+
CONFLICT_ROLLBACK,
41+
42+
/**
43+
* When a constraint violation occurs,no ROLLBACK is executed
44+
* so changes from prior commands within the same transaction
45+
* are preserved. This is the default behavior.
46+
*/
47+
CONFLICT_ABORT,
48+
49+
/**
50+
* When a constraint violation occurs, the command aborts with a return
51+
* code SQLITE_CONSTRAINT. But any changes to the database that
52+
* the command made prior to encountering the constraint violation
53+
* are preserved and are not backed out.
54+
*/
55+
CONFLICT_FAIL,
56+
57+
/**
58+
* When a constraint violation occurs, the one row that contains
59+
* the constraint violation is not inserted or changed.
60+
* But the command continues executing normally. Other rows before and
61+
* after the row that contained the constraint violation continue to be
62+
* inserted or updated normally. No error is returned.
63+
*/
64+
CONFLICT_IGNORE,
65+
66+
/**
67+
* When a UNIQUE constraint violation occurs, the pre-existing rows that
68+
* are causing the constraint violation are removed prior to inserting
69+
* or updating the current row. Thus the insert or update always occurs.
70+
* The command continues executing normally. No error is returned.
71+
* If a NOT NULL constraint violation occurs, the NULL value is replaced
72+
* by the default value for that column. If the column has no default
73+
* value, then the ABORT algorithm is used. If a CHECK constraint
74+
* violation occurs then the IGNORE algorithm is used. When this conflict
75+
* resolution strategy deletes rows in order to satisfy a constraint,
76+
* it does not invoke delete triggers on those rows.
77+
* This behavior might change in a future release.
78+
*/
79+
CONFLICT_REPLACE
80+
}
81+
3282
protected static int save(Save save, Class<?> classDef, DatabaseProvider databaseProvider) {
3383
int nb = 0;
3484

@@ -47,14 +97,19 @@ protected static int save(Save save, Class<?> classDef, DatabaseProvider databas
4797
}
4898

4999
//noinspection unchecked
50-
if (id <= 0 || Update.getBuilder(classDef, databaseProvider).model(model).query() <= 0) {
100+
if (id <= 0 || Update.getBuilder(classDef, databaseProvider)
101+
.withConflictResolution(save.getConflictResolution())
102+
.model(model)
103+
.query() <= 0) {
51104
modelsToInsert.add(model);
52105
} else {
53106
nb++;
54107
}
55108
}
56109

57-
nb += Insert.getBuilder(databaseProvider, modelsToInsert.toArray()).query();
110+
nb += Insert.getBuilder(databaseProvider, modelsToInsert.toArray())
111+
.withConflictResolution(save.getConflictResolution())
112+
.query();
58113

59114
return nb;
60115
}
@@ -72,15 +127,15 @@ protected static int insert(Insert insert, Class<?> classDef, DatabaseProvider d
72127
}
73128

74129
if (models.length == 1) {
75-
long newId = databaseProvider.insert(dbModelDescriptor.getTableDbName(), valuesArray[0]);
130+
long newId = databaseProvider.insert(dbModelDescriptor.getTableDbName(), valuesArray[0], insert.getConflictResolution());
76131
if (newId != -1) {
77132
dbModelDescriptor.setIdToModel(models[0], newId);
78133
return 1;
79134
} else {
80135
return 0;
81136
}
82137
} else {
83-
return databaseProvider.bulkInsert(dbModelDescriptor.getTableDbName(), valuesArray);
138+
return databaseProvider.bulkInsert(dbModelDescriptor.getTableDbName(), valuesArray, insert.getConflictResolution());
84139
}
85140
}
86141

@@ -186,14 +241,16 @@ protected static int update(Update update, Class<?> classDef, DatabaseProvider d
186241
tableDesc.getTableDbName(),
187242
uriSuffix,
188243
valuesArray,
189-
conditionsArray
244+
conditionsArray,
245+
update.getConflictResolution()
190246
);
191247
} else {
192248
return databaseProvider.bulkUpdate(
193249
getTableDescription(classDef, databaseProvider).getTableDbName(),
194250
null,
195251
new ContentValues[]{update.getContentValues()},
196-
new Where[][]{update.getConditions()}
252+
new Where[][]{update.getConditions()},
253+
update.getConflictResolution()
197254
);
198255
}
199256
}

‎android-query/src/main/java/net/frju/androidquery/operation/function/Insert.java

+21-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,18 @@
3131
*/
3232
public class Insert extends Query {
3333
private final Object[] mModels;
34+
private final ConflictResolution mConflictResolution;
3435

3536
public Object[] getModels() {
3637
return mModels;
3738
}
3839

39-
private Insert(Object... models) {
40+
public ConflictResolution getConflictResolution() {
41+
return mConflictResolution;
42+
}
43+
44+
private Insert(ConflictResolution conflictResolution, Object... models) {
45+
mConflictResolution = conflictResolution;
4046
mModels = models;
4147
}
4248

@@ -56,6 +62,7 @@ <T> Insert.Builder getBuilder(@NonNull DatabaseProvider databaseProvider, @NonNu
5662

5763
public static class Builder<T> {
5864
private final T[] mModels;
65+
private ConflictResolution mConflictResolution = ConflictResolution.CONFLICT_IGNORE;
5966
private final DatabaseProvider mDatabaseProvider;
6067

6168
@SafeVarargs
@@ -64,12 +71,24 @@ private Builder(@NonNull DatabaseProvider databaseProvider, @NonNull T... models
6471
mDatabaseProvider = databaseProvider;
6572
}
6673

74+
/**
75+
* Specify a Compare where for the Select query
76+
*
77+
* @param conflictResolution the resolution algorithm. By default it's CONFLICT_IGNORE.
78+
* @return Call Builder#query or the rx methods to run the query
79+
*/
80+
public Insert.Builder<T> withConflictResolution(ConflictResolution conflictResolution) {
81+
mConflictResolution = conflictResolution;
82+
return this;
83+
}
84+
6785
/**
6886
* Executes an Insert query
87+
* @return the number of inserted items
6988
*/
7089
public int query() {
7190
return insert(
72-
new Insert(mModels),
91+
new Insert(mConflictResolution, mModels),
7392
mModels != null && mModels.length > 0 ? mModels[0].getClass() : Object.class,
7493
mDatabaseProvider
7594
);

0 commit comments

Comments
 (0)