narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

added foreign keys constrains. old conversation will actually be removed now like the ui claims

Browse source
This commit is contained in:
Daniel Gultsch 2014-01-29 00:15:38 +01:00
parent 76cfab03ec
commit ad11dab635
1 changed files with 46 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/de/gultsch/chat/persistance/DatabaseBackend.java
View file

@ -26,18 +26,23 @@ public class DatabaseBackend extends SQLiteOpenHelper {
@Override @Override
public void onCreate(SQLiteDatabase db) { public void onCreate(SQLiteDatabase db) {
db.execSQL("PRAGMA foreign_keys=ON;");
db.execSQL("create table " + Account.TABLENAME + "(" + Account.UUID
+ " TEXT PRIMARY KEY," + Account.USERNAME + " TEXT," + Account.SERVER
+ " TEXT," + Account.PASSWORD + " TEXT)");
db.execSQL("create table " + Conversation.TABLENAME + " (" db.execSQL("create table " + Conversation.TABLENAME + " ("
+ Conversation.UUID + " TEXT PRIMARY KEY, " + Conversation.NAME + Conversation.UUID + " TEXT PRIMARY KEY, " + Conversation.NAME
+ " TEXT, " + Conversation.PHOTO_URI + " TEXT, " + " TEXT, " + Conversation.PHOTO_URI + " TEXT, "
+ Conversation.ACCOUNT + " TEXT, " + Conversation.CONTACT + Conversation.ACCOUNT + " TEXT, " + Conversation.CONTACT
+ " TEXT, " + Conversation.CREATED + " NUMBER, " + " TEXT, " + Conversation.CREATED + " NUMBER, "
+ Conversation.STATUS + " NUMBER)"); + Conversation.STATUS + " NUMBER,"
+ "FOREIGN KEY("+Conversation.ACCOUNT+") REFERENCES "+Account.TABLENAME+"("+Account.UUID+") ON DELETE CASCADE);");
db.execSQL("create table " + Message.TABLENAME + "( " + Message.UUID db.execSQL("create table " + Message.TABLENAME + "( " + Message.UUID
+ " TEXT PRIMARY KEY, " + Message.CONVERSATION + " TEXT, " + Message.TIME_SENT +" NUMBER, " + " TEXT PRIMARY KEY, " + Message.CONVERSATION + " TEXT, "
+ Message.COUNTERPART + " TEXT, " + Message.BODY + " TEXT, " + Message.TIME_SENT + " NUMBER, " + Message.COUNTERPART
+ Message.ENCRYPTION + " NUMBER, " + Message.STATUS + " TEXT, " + Message.BODY + " TEXT, " + Message.ENCRYPTION
+ " NUMBER)"); + " NUMBER, " + Message.STATUS + " NUMBER,"
db.execSQL("create table "+Account.TABLENAME+"("+Account.UUID+" TEXT,"+Account.USERNAME+" TEXT,"+Account.SERVER+" TEXT,"+Account.PASSWORD+" TEXT)"); + "FOREIGN KEY("+Message.CONVERSATION+") REFERENCES "+Conversation.TABLENAME+"("+Message.UUID+") ON DELETE CASCADE);");
} }
@Override @Override
@ -70,8 +75,9 @@ public class DatabaseBackend extends SQLiteOpenHelper {
public int getConversationCount() { public int getConversationCount() {
SQLiteDatabase db = this.getReadableDatabase(); SQLiteDatabase db = this.getReadableDatabase();
Cursor cursor = db.rawQuery( Cursor cursor = db.rawQuery("select count(uuid) as count from "
"select count(uuid) as count from "+Conversation.TABLENAME+" where "+Conversation.STATUS+"="+Conversation.STATUS_AVAILABLE, null); + Conversation.TABLENAME + " where " + Conversation.STATUS
+ "=" + Conversation.STATUS_AVAILABLE, null);
cursor.moveToFirst(); cursor.moveToFirst();
return cursor.getInt(0); return cursor.getInt(0);
} }
@ -93,8 +99,9 @@ public class DatabaseBackend extends SQLiteOpenHelper {
List<Message> list = new ArrayList<Message>(); List<Message> list = new ArrayList<Message>();
SQLiteDatabase db = this.getReadableDatabase(); SQLiteDatabase db = this.getReadableDatabase();
String[] selectionArgs = { conversation.getUuid() }; String[] selectionArgs = { conversation.getUuid() };
Cursor cursor = db.query(Message.TABLENAME, null,Message.CONVERSATION +"=?", selectionArgs, null, null, Cursor cursor = db.query(Message.TABLENAME, null, Message.CONVERSATION
Message.TIME_SENT+" DESC",String.valueOf(limit)); + "=?", selectionArgs, null, null, Message.TIME_SENT + " DESC",
String.valueOf(limit));
if (cursor.getCount() > 0) { if (cursor.getCount() > 0) {
cursor.moveToLast(); cursor.moveToLast();
do { do {
@ -107,8 +114,11 @@ public class DatabaseBackend extends SQLiteOpenHelper {
public Conversation findConversation(Account account, Contact contact) { public Conversation findConversation(Account account, Contact contact) {
SQLiteDatabase db = this.getReadableDatabase(); SQLiteDatabase db = this.getReadableDatabase();
String[] selectionArgs = { account.getUuid(), contact.getJid() }; String[] selectionArgs = { account.getUuid(), contact.getJid() };
Cursor cursor = db.query(Conversation.TABLENAME, null,Conversation.ACCOUNT+"=? AND "+Conversation.CONTACT+"=?", selectionArgs, null, null, null); Cursor cursor = db.query(Conversation.TABLENAME, null,
if (cursor.getCount() == 0) return null; Conversation.ACCOUNT + "=? AND " + Conversation.CONTACT + "=?",
selectionArgs, null, null, null);
if (cursor.getCount() == 0)
return null;
cursor.moveToFirst(); cursor.moveToFirst();
return Conversation.fromCursor(cursor); return Conversation.fromCursor(cursor);
} }
@ -116,13 +126,15 @@ public class DatabaseBackend extends SQLiteOpenHelper {
public void updateConversation(Conversation conversation) { public void updateConversation(Conversation conversation) {
SQLiteDatabase db = this.getWritableDatabase(); SQLiteDatabase db = this.getWritableDatabase();
String[] args = { conversation.getUuid() }; String[] args = { conversation.getUuid() };
db.update(Conversation.TABLENAME, conversation.getContentValues(),Conversation.UUID+"=?",args); db.update(Conversation.TABLENAME, conversation.getContentValues(),
Conversation.UUID + "=?", args);
} }
public List<Account> getAccounts() { public List<Account> getAccounts() {
List<Account> list = new ArrayList<Account>(); List<Account> list = new ArrayList<Account>();
SQLiteDatabase db = this.getReadableDatabase(); SQLiteDatabase db = this.getReadableDatabase();
Cursor cursor = db.query(Account.TABLENAME, null, null, null, null, null, null); Cursor cursor = db.query(Account.TABLENAME, null, null, null, null,
null, null);
Log.d("gultsch", "found " + cursor.getCount() + " accounts"); Log.d("gultsch", "found " + cursor.getCount() + " accounts");
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
list.add(Account.fromCursor(cursor)); list.add(Account.fromCursor(cursor));
@ -133,14 +145,22 @@ public class DatabaseBackend extends SQLiteOpenHelper {
public void updateAccount(Account account) { public void updateAccount(Account account) {
SQLiteDatabase db = this.getWritableDatabase(); SQLiteDatabase db = this.getWritableDatabase();
String[] args = { account.getUuid() }; String[] args = { account.getUuid() };
db.update(Account.TABLENAME, account.getContentValues(),Account.UUID+"=?",args); db.update(Account.TABLENAME, account.getContentValues(), Account.UUID
+ "=?", args);
} }
public void deleteAccount(Account account) { public void deleteAccount(Account account) {
SQLiteDatabase db = this.getWritableDatabase(); SQLiteDatabase db = this.getWritableDatabase();
String[] args = { account.getUuid() }; String[] args = { account.getUuid() };
Log.d("gultsch","backend trying to delete account with uuid:"+account.getUuid()); Log.d("gultsch", "backend trying to delete account with uuid:"
+ account.getUuid());
db.delete(Account.TABLENAME, Account.UUID + "=?", args); db.delete(Account.TABLENAME, Account.UUID + "=?", args);
} }
@Override
public SQLiteDatabase getWritableDatabase() {
SQLiteDatabase db = super.getWritableDatabase();
db.execSQL("PRAGMA foreign_keys=ON;");
return db;
}
} }