From a4db85de038f3d07bd379ddaf37bc7815c37b28b Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Sat, 10 May 2014 16:20:44 +0200
Subject: More query fixes (incorrect field names, table alias)

---
 src/database/QueryUtils.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/database/QueryUtils.java')

diff --git a/src/database/QueryUtils.java b/src/database/QueryUtils.java
index c6b8304..0957647 100644
--- a/src/database/QueryUtils.java
+++ b/src/database/QueryUtils.java
@@ -2,7 +2,6 @@ package database;
 
 import data.Tweet;
 import data.User;
-import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 /**
@@ -78,7 +77,7 @@ public class QueryUtils {
         sql += ")\n";
         // CTE that tries to update the table with new values (PSQL extension)
         sql += ", upsert AS (\n";
-        sql += "    UPDATE " + table + " SET " + set_values + " FROM nv\n";
+        sql += "    UPDATE " + table + " u SET " + set_values + " FROM nv\n";
         sql += "    WHERE " + pkey_matches + " RETURNING 1\n";
         sql += ")\n";
         // if nothing got updated, insert new entry
@@ -91,9 +90,9 @@ public class QueryUtils {
     public static void setInsertParams(NamedPreparedStatement tweetStatement,
             NamedPreparedStatement profileStatement,
             Tweet tweet) throws SQLException {
-        tweetStatement.setLong("id", tweet.id);
+        tweetStatement.setLong("tweetid", tweet.id);
         tweetStatement.setString("createdat", tweet.created_at);
-        tweetStatement.setLong("favoritecount", tweet.favorite_count);
+        tweetStatement.setLong("favcount", tweet.favorite_count);
         tweetStatement.setLong("retweetcount", tweet.retweet_count);
         tweetStatement.setString("text", tweet.text);
         if (tweet.coordinates != null) {
-- 
cgit v1.2.1