X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fpostgresqlstorage.cpp;h=36301c6b33651c31ca22feb7524553dd52ebb06a;hb=145a52eb79fed146731f85c23b60f0609e40e785;hp=88bc86ce93f342c08039cc660d3f440f332ffb22;hpb=1a5c1814a0c52f6f35e65c7033b2f896bf1188e3;p=quassel.git diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp index 88bc86ce..36301c6b 100644 --- a/src/core/postgresqlstorage.cpp +++ b/src/core/postgresqlstorage.cpp @@ -49,7 +49,7 @@ bool PostgreSqlStorage::isAvailable() const { if (!QSqlDatabase::isDriverAvailable("QPSQL")) { qWarning() << qPrintable(tr("PostgreSQL driver plugin not available for Qt. Installed drivers:")) - << qPrintable(QSqlDatabase::drivers().join(", ")); + << qPrintable(QSqlDatabase::drivers().join(", ")); return false; } return true; @@ -115,7 +115,8 @@ bool PostgreSqlStorage::initDbSession(QSqlDatabase& db) break; default: // The slash got replaced with 0 or more than 2 slashes! o_O - qCritical() << "Your version of Qt does something _VERY_ strange to slashes in QSqlQueries! You should consult your trusted doctor!"; + qCritical() + << "Your version of Qt does something _VERY_ strange to slashes in QSqlQueries! You should consult your trusted doctor!"; return false; break; } @@ -1907,6 +1908,82 @@ std::vector PostgreSqlStorage::requestMsgsFiltered( return messagelist; } +std::vector PostgreSqlStorage::requestMsgsForward( + UserId user, BufferId bufferId, MsgId first, MsgId last, int limit, Message::Types type, Message::Flags flags) +{ + std::vector messagelist; + + QSqlDatabase db = logDb(); + if (!beginReadOnlyTransaction(db)) { + qWarning() << "PostgreSqlStorage::requestMsgsForward(): cannot start read only transaction!"; + qWarning() << " -" << qPrintable(db.lastError().text()); + return messagelist; + } + + BufferInfo bufferInfo = getBufferInfo(user, bufferId); + if (!bufferInfo.isValid()) { + db.rollback(); + return messagelist; + } + + QString queryName; + QVariantList params; + + if (first == -1) { + params << std::numeric_limits::min(); + } else { + params << first.toQint64(); + } + + if (last == -1) { + params << std::numeric_limits::max(); + } else { + params << last.toQint64(); + } + + params << bufferId.toInt(); + + int typeRaw = type; + int flagsRaw = flags; + params << typeRaw; + params << flagsRaw; + + if (limit != -1) + params << limit; + else + params << QVariant(QVariant::Int); + + QSqlQuery query = executePreparedQuery("select_messagesForward", params, db); + + if (!watchQuery(query)) { + qDebug() << "select_messages failed"; + db.rollback(); + return messagelist; + } + + QDateTime timestamp; + while (query.next()) { + // PostgreSQL returns date/time in ISO 8601 format, no 64-bit handling needed + // See https://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-DATETIME-OUTPUT + timestamp = query.value(1).toDateTime(); + timestamp.setTimeSpec(Qt::UTC); + Message msg(timestamp, + bufferInfo, + (Message::Type)query.value(2).toInt(), + query.value(8).toString(), + query.value(4).toString(), + query.value(5).toString(), + query.value(6).toString(), + query.value(7).toString(), + (Message::Flags)query.value(3).toInt()); + msg.setMsgId(query.value(0).toLongLong()); + messagelist.push_back(std::move(msg)); + } + + db.commit(); + return messagelist; +} + std::vector PostgreSqlStorage::requestAllMsgs(UserId user, MsgId first, MsgId last, int limit) { std::vector messagelist;