Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 22:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Fixed an ambiguous column name in a SQL join.

Browse Source
This commit is contained in:
akwizgran
2013-03-01 20:40:41 +00:00
parent 7ed85c62c3
commit 93beb6709c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-core/src/net/sf/briar/db/JdbcDatabase.java
View File

@@ -1269,10 +1269,11 @@ abstract class JdbcDatabase implements Database<Connection> {
ResultSet rs = null; ResultSet rs = null;
try { try {
String sql = "SELECT m.messageId, parentId, subject, timestamp," String sql = "SELECT m.messageId, parentId, subject, timestamp,"
+ " contactId, read, starred, seen" + " m.contactId, read, starred, seen"
+ " FROM messages AS m" + " FROM messages AS m"
+ " JOIN statuses AS s" + " JOIN statuses AS s"
+ " ON m.messageId = s.messageId" + " ON m.messageId = s.messageId"
+ " AND m.contactId = s.contactId"
+ " WHERE groupId IS NULL"; + " WHERE groupId IS NULL";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
rs = ps.executeQuery(); rs = ps.executeQuery();