empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Distinct rows from join

Browse source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-10-24 14:38:03 -07:00
parent c342f0d7e4
commit cb3f9a6805
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/database/MmsDatabase.java
View file

@ -309,7 +309,7 @@ public class MmsDatabase extends MessagingDatabase {
private Cursor rawQuery(@NonNull String where, @Nullable String[] arguments) {
SQLiteDatabase database = databaseHelper.getReadableDatabase();
return database.rawQuery("SELECT " + Util.join(MMS_PROJECTION, ",") +
return database.rawQuery("SELECT DISTINCT " + Util.join(MMS_PROJECTION, ",") +
" FROM " + MmsDatabase.TABLE_NAME + " LEFT OUTER JOIN " + AttachmentDatabase.TABLE_NAME +
" ON (" + MmsDatabase.TABLE_NAME + "." + MmsDatabase.ID + " = " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.MMS_ID + ")" +
" WHERE " + where, arguments);

1
src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
View file

@ -222,6 +222,7 @@ public class MmsSmsDatabase extends Database {
String unionQuery = unionQueryBuilder.buildUnionQuery(new String[] {smsSubQuery, mmsSubQuery}, order, limit);
SQLiteQueryBuilder outerQueryBuilder = new SQLiteQueryBuilder();
outerQueryBuilder.setDistinct(true);
outerQueryBuilder.setTables("(" + unionQuery + ")");
String query = outerQueryBuilder.buildQuery(projection, null, null, null, null, null, null);