diff options
author | Peter Wu <peter@lekensteyn.nl> | 2014-05-10 16:20:44 +0200 |
---|---|---|
committer | Peter Wu <peter@lekensteyn.nl> | 2014-05-10 16:20:44 +0200 |
commit | a4db85de038f3d07bd379ddaf37bc7815c37b28b (patch) | |
tree | d2c0dc628f572165b39ed58d21cce6f54ca007ae | |
parent | c47ee5696665af5bdaf85e30fe3514009cde2a7c (diff) | |
download | Datafiller-a4db85de038f3d07bd379ddaf37bc7815c37b28b.tar.gz |
More query fixes (incorrect field names, table alias)
-rw-r--r-- | src/database/NamedPreparedStatement.java | 1 | ||||
-rw-r--r-- | src/database/QueryUtils.java | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/database/NamedPreparedStatement.java b/src/database/NamedPreparedStatement.java index 0569db7..f635891 100644 --- a/src/database/NamedPreparedStatement.java +++ b/src/database/NamedPreparedStatement.java @@ -40,6 +40,7 @@ public class NamedPreparedStatement { } } if (indices.isEmpty()) { + System.err.println(stmt); throw new RuntimeException("Missing " + fieldName + " in query!"); } return indices; 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) { |