From f5ec5b9569446f1793746de19df42f021f933a64 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 30 Jan 2013 15:35:08 +0000
Subject: [PATCH] Fixed an ambiguous column name in getRetentionUpdate().
---
briar-core/src/net/sf/briar/db/JdbcDatabase.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/briar-core/src/net/sf/briar/db/JdbcDatabase.java b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
index b884dc6dc5..4423030ac7 100644
--- a/briar-core/src/net/sf/briar/db/JdbcDatabase.java
+++ b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
@@ -1502,8 +1502,9 @@ abstract class JdbcDatabase implements Database<Connection> {
ResultSet rs = null;
try {
String sql = "SELECT timestamp, localVersion"
- + " FROM messages JOIN retentionVersions"
- + " WHERE contactId = ? AND localVersion > localAcked"
+ + " FROM messages AS m"
+ + " JOIN retentionVersions AS rv"
+ + " WHERE rv.contactId = ? AND localVersion > localAcked"
+ " ORDER BY timestamp LIMIT ?";
ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt());
--
GitLab