run tests on h2 database

5 files changed, 37 insertions, 27 deletions

diff --git a/juick-server-jdbc/src/main/java/com/juick/service/BaseJdbcService.java b/juick-server-jdbc/src/main/java/com/juick/service/BaseJdbcService.java
index 67ddf713..d0bf0195 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/BaseJdbcService.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/BaseJdbcService.java
@@ -17,6 +17,7 @@
 
 package com.juick.service;
 
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcDaoSupport;
 
 import javax.annotation.PostConstruct;
@@ -28,9 +29,9 @@ import javax.sql.DataSource;
  */
 public class BaseJdbcService extends NamedParameterJdbcDaoSupport {
     @Inject
-    DataSource dataSource;
+    JdbcTemplate jdbcTemplate;
     @PostConstruct
     public void init() {
-        setDataSource(dataSource);
+        setJdbcTemplate(jdbcTemplate);
     }
 }
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
index 0ebd2838..bcce56ca 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -43,11 +43,10 @@ import org.springframework.util.Assert;
 
 import javax.inject.Inject;
 import java.sql.*;
+import java.time.Instant;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+import java.util.Date;
 import java.util.stream.Collectors;
 
 /**
@@ -178,16 +177,15 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
     @Override
     public int createReply(final int mid, final int rid, final int uid, final String txt, final String attachment) {
         int ridnew = getReplyIDIncrement(mid);
-        getJdbcTemplate().execute("SET @ts=CURRENT_TIMESTAMP()");
+        Date ts = Date.from(Instant.now());
         getJdbcTemplate().update("INSERT INTO replies(message_id, reply_id, user_id, replyto, attach, txt, ts) " +
-                        "VALUES (?, ?, ?, ?, ?, ?, @ts)",
-                new Object[]{mid, ridnew, uid, rid, attachment, txt},
-                new int[]{Types.INTEGER, Types.SMALLINT, Types.INTEGER, Types.SMALLINT, Types.CHAR, Types.VARCHAR});
+                        "VALUES (?, ?, ?, ?, ?, ?, ?)",
+                mid, ridnew, uid, rid, attachment, txt, ts);
 
         if (ridnew > 0) {
             getJdbcTemplate().update(
-                    "UPDATE messages SET replies = replies + 1, updated=@ts WHERE message_id = ?",
-                    mid);
+                    "UPDATE messages SET replies = replies + 1, updated=? WHERE message_id = ?",
+                    ts, mid);
         }
         return ridnew;
     }
@@ -197,9 +195,6 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
         return getJdbcTemplate().execute((ConnectionCallback<Integer>) conn -> {
             conn.setAutoCommit(false);
             final int replyNo;
-            try (PreparedStatement ps = conn.prepareStatement("START TRANSACTION")) {
-                ps.executeUpdate();
-            }
             try (PreparedStatement ps = conn.prepareStatement("SELECT maxreplyid+1 FROM messages WHERE message_id=? FOR UPDATE")) {
                 ps.setInt(1, mid);
                 try (ResultSet resultSet = ps.executeQuery()) {
@@ -317,7 +312,7 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                         + "LEFT JOIN favorites "
                         + "ON messages.message_id = favorites.message_id "
                         + "WHERE messages.message_id = ? "
-                        + "GROUP BY mid, rid, replyto, uid, nick, banned, ago, ts, readonly, "
+                        + "GROUP BY mid, rid, replyto, uid, nick, banned, ago, messages.ts, readonly, "
                         + "privacy, replies, attach, place_id, lat, lon, tags, repliesby, q",
                 new MessageMapper(),
                 mid);
@@ -906,12 +901,12 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
         return getJdbcTemplate().queryForList("SELECT replies.message_id FROM replies " +
                 "INNER JOIN messages ON replies.message_id = messages.message_id " +
                 "LEFT JOIN messages_tags ON messages_tags.message_id = messages.message_id " +
-                "WHERE COALESCE(messages_tags.tag_id, 0) != 2 AND replies.ts > DATE_ADD(now(), INTERVAL -2 HOUR) " +
-                "AND messages.popular=0 GROUP BY message_id having COUNT(DISTINCT(replies.user_id)) > 5 " +
+                "WHERE COALESCE(messages_tags.tag_id, 0) != 2 AND replies.ts > TIMESTAMPADD(HOUR, -2, CURRENT_TIMESTAMP) " +
+                "AND messages.popular=0 GROUP BY messages.message_id having COUNT(DISTINCT(replies.user_id)) > 5 " +
                 "UNION ALL SELECT favorites.message_id FROM favorites " +
                 "INNER JOIN messages ON messages.message_id = favorites.message_id " +
                 "LEFT JOIN messages_tags ON messages_tags.message_id = messages.message_id " +
-                "WHERE COALESCE(messages_tags.tag_id, 0) != 2 AND favorites.ts > DATE_ADD(NOW(), INTERVAL -2 HOUR) " +
-                "AND messages.popular=0 GROUP BY message_id HAVING COUNT(DISTINCT favorites.user_id) > 1;", Integer.class);
+                "WHERE COALESCE(messages_tags.tag_id, 0) != 2 AND favorites.ts > TIMESTAMPADD(HOUR, -2, CURRENT_TIMESTAMP) " +
+                "AND messages.popular=0 GROUP BY messages.message_id HAVING COUNT(DISTINCT favorites.user_id) > 1;", Integer.class);
     }
 }
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/PMQueriesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/PMQueriesServiceImpl.java
index fcb8a6f3..af3fa404 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/PMQueriesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/PMQueriesServiceImpl.java
@@ -43,7 +43,7 @@ public class PMQueriesServiceImpl extends BaseJdbcService implements PMQueriesSe
         if (ret) {
             getJdbcTemplate().update(
                     "INSERT INTO pm_streams(user_id, user_id_to, lastmessage, unread) VALUES (?, ?, NOW(), 1) "
-                            + "ON DUPLICATE KEY UPDATE lastmessage = NOW(), unread = unread + 1",
+                            + "ON DUPLICATE KEY UPDATE lastmessage = CURRENT_TIMESTAMP(), unread = unread + 1",
                     uidFrom, uid_to);
         }
         return ret;
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/PushQueriesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/PushQueriesServiceImpl.java
index 878d10d5..7f97956c 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/PushQueriesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/PushQueriesServiceImpl.java
@@ -18,6 +18,7 @@
 package com.juick.service;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.stereotype.Repository;
@@ -132,7 +133,11 @@ public class PushQueriesServiceImpl extends BaseJdbcService implements PushQueri
     @Transactional
     @Override
     public boolean addAPNSToken(Integer uid, String token) {
-        return getJdbcTemplate().update("INSERT IGNORE INTO ios(user_id,token) VALUES (?, ?)",
-                uid, token) > 0;
+        try {
+            return getJdbcTemplate().update("INSERT INTO ios(user_id,token) VALUES (?, ?)",
+                    uid, token) > 0;
+        } catch (DuplicateKeyException e) {
+            return true;
+        }
     }
 }
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/SubscriptionServiceImpl.java
index 9dd41721..66b62833 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/SubscriptionServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/SubscriptionServiceImpl.java
@@ -21,6 +21,7 @@ import com.juick.Tag;
 import com.juick.User;
 import com.juick.server.helpers.NotifyOpts;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.stereotype.Repository;
@@ -147,8 +148,12 @@ public class SubscriptionServiceImpl extends BaseJdbcService implements Subscrip
     @Transactional
     @Override
     public boolean subscribeMessage(final int mid, final int vuid) {
-        return getJdbcTemplate().update(
-                "INSERT IGNORE INTO subscr_messages(suser_id, message_id) VALUES (?, ?)", vuid, mid) == 1;
+        try {
+            return getJdbcTemplate().update(
+                    "INSERT INTO subscr_messages(suser_id, message_id) VALUES (?, ?)", vuid, mid) == 1;
+        } catch (DuplicateKeyException e) {
+            return true;
+        }
     }
 
     @Transactional
@@ -161,8 +166,12 @@ public class SubscriptionServiceImpl extends BaseJdbcService implements Subscrip
     @Transactional
     @Override
     public boolean subscribeUser(final User user, final User toUser) {
-        return getJdbcTemplate().update(
-                "INSERT IGNORE INTO subscr_users(user_id,suser_id) VALUES (?,?)", toUser.getUid(), user.getUid()) == 1;
+        try {
+            return getJdbcTemplate().update(
+                    "INSERT INTO subscr_users(user_id,suser_id) VALUES (?,?)", toUser.getUid(), user.getUid()) == 1;
+        } catch (DuplicateKeyException e) {
+            return true;
+        }
     }
 
     @Transactional