Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Fixed an ambiguous column name in getRetentionUpdate().

Browse Source
This commit is contained in:
akwizgran
2013-01-30 15:35:08 +00:00
parent b4818228c4
commit f5ec5b9569
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1502,8 +1502,9 @@ abstract class JdbcDatabase implements Database<Connection> {
ResultSet rs = null; ResultSet rs = null;
try { try {
String sql = "SELECT timestamp, localVersion" String sql = "SELECT timestamp, localVersion"
+ " FROM messages JOIN retentionVersions" + " FROM messages AS m"
+ " WHERE contactId = ? AND localVersion > localAcked" + " JOIN retentionVersions AS rv"
+ " WHERE rv.contactId = ? AND localVersion > localAcked"
+ " ORDER BY timestamp LIMIT ?"; + " ORDER BY timestamp LIMIT ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());