From 93beb6709c3b2534f04ae345973a4525490dce9c Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 1 Mar 2013 20:40:41 +0000
Subject: [PATCH] Fixed an ambiguous column name in a SQL join.
---
briar-core/src/net/sf/briar/db/JdbcDatabase.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/briar-core/src/net/sf/briar/db/JdbcDatabase.java b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
index 2ea61d2da3..6f242d906f 100644
--- a/briar-core/src/net/sf/briar/db/JdbcDatabase.java
+++ b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
@@ -1269,10 +1269,11 @@ abstract class JdbcDatabase implements Database<Connection> {
ResultSet rs = null;
try {
String sql = "SELECT m.messageId, parentId, subject, timestamp,"
- + " contactId, read, starred, seen"
+ + " m.contactId, read, starred, seen"
+ " FROM messages AS m"
+ " JOIN statuses AS s"
+ " ON m.messageId = s.messageId"
+ + " AND m.contactId = s.contactId"
+ " WHERE groupId IS NULL";
ps = txn.prepareStatement(sql);
rs = ps.executeQuery();
--
GitLab