Make server tests also run against postgres

message/store.go

@@ -26,12 +26,13 @@ type Store interface {
 	AddMessage(m *model.Message) error
 	AddMessages(ms []*model.Message) error
 	DB() *sql.DB
+	Message(id string) (*model.Message, error)
+	MessageCounts() (map[string]int, error)
 	Messages(topic string, since model.SinceMarker, scheduled bool) ([]*model.Message, error)
 	MessagesDue() ([]*model.Message, error)
 	MessagesExpired() ([]string, error)
-	Message(id string) (*model.Message, error)
 	MarkPublished(m *model.Message) error
-	MessageCounts() (map[string]int, error)
+	UpdateMessageTime(messageID string, timestamp int64) error
 	Topics() ([]string, error)
 	DeleteMessages(ids ...string) error
 	DeleteScheduledBySequenceID(topic, sequenceID string) ([]string, error)
@@ -71,6 +72,7 @@ type storeQueries struct {
 	selectAttachmentsSizeByUserID    string
 	selectStats                      string
 	updateStats                      string
+	updateMessageTime                string
 }
 
 // commonStore implements store operations that are identical across database backends
@@ -302,6 +304,12 @@ func (c *commonStore) Message(id string) (*model.Message, error) {
 	return readMessage(rows)
 }
 
+// UpdateMessageTime updates the time column for a message by ID. This is only used for testing.
+func (c *commonStore) UpdateMessageTime(messageID string, timestamp int64) error {
+	_, err := c.db.Exec(c.queries.updateMessageTime, timestamp, messageID)
+	return err
+}
+
 func (c *commonStore) MarkPublished(m *model.Message) error {
 	c.mu.Lock()
 	defer c.mu.Unlock()

message/store_postgres.go

@@ -71,8 +71,9 @@ const (
 	pgSelectAttachmentsSizeBySenderQuery = `SELECT COALESCE(SUM(attachment_size), 0) FROM message WHERE user_id = '' AND sender = $1 AND attachment_expires >= $2`
 	pgSelectAttachmentsSizeByUserIDQuery = `SELECT COALESCE(SUM(attachment_size), 0) FROM message WHERE user_id = $1 AND attachment_expires >= $2`
 
-	pgSelectStatsQuery = `SELECT value FROM message_stats WHERE key = 'messages'`
-	pgUpdateStatsQuery = `UPDATE message_stats SET value = $1 WHERE key = 'messages'`
+	pgSelectStatsQuery        = `SELECT value FROM message_stats WHERE key = 'messages'`
+	pgUpdateStatsQuery        = `UPDATE message_stats SET value = $1 WHERE key = 'messages'`
+	pgUpdateMessageTimesQuery = `UPDATE message SET time = $1 WHERE mid = $2`
 )
 
 var pgQueries = storeQueries{
@@ -100,6 +101,7 @@ var pgQueries = storeQueries{
 	selectAttachmentsSizeByUserID:    pgSelectAttachmentsSizeByUserIDQuery,
 	selectStats:                      pgSelectStatsQuery,
 	updateStats:                      pgUpdateStatsQuery,
+	updateMessageTime:                pgUpdateMessageTimesQuery,
 }
 
 // NewPostgresStore creates a new PostgreSQL-backed message cache store.

message/store_sqlite.go

@@ -74,8 +74,9 @@ const (
 	sqliteSelectAttachmentsSizeBySenderQuery = `SELECT IFNULL(SUM(attachment_size), 0) FROM messages WHERE user = '' AND sender = ? AND attachment_expires >= ?`
 	sqliteSelectAttachmentsSizeByUserIDQuery = `SELECT IFNULL(SUM(attachment_size), 0) FROM messages WHERE user = ? AND attachment_expires >= ?`
 
-	sqliteSelectStatsQuery = `SELECT value FROM stats WHERE key = 'messages'`
-	sqliteUpdateStatsQuery = `UPDATE stats SET value = ? WHERE key = 'messages'`
+	sqliteSelectStatsQuery       = `SELECT value FROM stats WHERE key = 'messages'`
+	sqliteUpdateStatsQuery       = `UPDATE stats SET value = ? WHERE key = 'messages'`
+	sqliteUpdateMessageTimeQuery = `UPDATE messages SET time = ? WHERE mid = ?`
 )
 
 var sqliteQueries = storeQueries{
@@ -103,6 +104,7 @@ var sqliteQueries = storeQueries{
 	selectAttachmentsSizeByUserID:    sqliteSelectAttachmentsSizeByUserIDQuery,
 	selectStats:                      sqliteSelectStatsQuery,
 	updateStats:                      sqliteUpdateStatsQuery,
+	updateMessageTime:                sqliteUpdateMessageTimeQuery,
 }
 
 // NewSQLiteStore creates a SQLite file-backed cache