eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Improve sorting

Browse source
This commit is contained in:
eelke 2022-04-02 08:33:48 +02:00
parent 06504ecc1f
commit 2c5a42f45d
4 changed files with 76 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

100
pglab/crud/CrudModel.cpp
View file

@ -6,6 +6,7 @@
#include "catalog/PgConstraintContainer.h"
#include "SqlFormattingUtils.h"
#include "Pgsql_oids.h"
#include "CustomDataRole.h"
#include <QtConcurrent>
#include <QFuture>
#include <QFutureWatcher>
@ -124,37 +125,79 @@ CrudModel::Value CrudModel::getSavedData(const RowMapping &row_mapping, int colu
return val.value_or(Value());
}
QVariant StringToVariant(const std::string &str, Oid oid)
{
Pgsql::Value v(str.c_str(), oid);
switch (oid) {
default:
return QString::fromStdString(str);
case Pgsql::timestamp_oid:
case Pgsql::timestamptz_oid:
return v.operator QDateTime();
case Pgsql::date_oid:
return v.operator QDate();
case Pgsql::time_oid:
case Pgsql::timetz_oid:
return v.operator QTime();
case Pgsql::int2_oid:
return v.operator int16_t();
case Pgsql::int4_oid:
return v.operator int32_t();
case Pgsql::oid_oid:
case Pgsql::int8_oid:
return v.operator int64_t();
case Pgsql::bool_oid:
return v.operator bool();
case Pgsql::float4_oid:
return v.operator float();
case Pgsql::float8_oid:
return v.operator double();
}
}
QVariant CrudModel::data(const QModelIndex &index, int role) const
{
QVariant v;
if (role == Qt::EditRole) {
Oid typ = getType(index.column());
if (role == Qt::EditRole || role == Qt::DisplayRole)
{
auto value = getLatestData(index);
if (value) {
QString s = QString::fromUtf8(value->c_str());
v = s;
}
if (value) {
if (role == Qt::EditRole)
return QString::fromUtf8(value->c_str());
else
{
if (typ == Pgsql::bool_oid)
return *value == "t"; //s = (s == "t") ? "TRUE" : "FALSE";
else
{
QString s = QString::fromUtf8(value->c_str());
s.truncate(256);
return s;
}
}
}
}
else if (role == CustomDataTypeRole)
return typ;
else if (role == CustomSortRole)
{
auto value = getLatestData(index);
if (value) {
return StringToVariant(value->c_str(), typ);
}
}
}
else if (role == Qt::DisplayRole) {
auto value = getLatestData(index);
if (value) {
Oid o = m_roData->type(index.column());
if (o == Pgsql::bool_oid) {
v = *value == "t"; //s = (s == "t") ? "TRUE" : "FALSE";
}
else {
QString s = QString::fromUtf8(value->c_str());
if (s.length() > 256) {
s.truncate(256);
}
v = s;
}
}
}
else if (role == Qt::UserRole) {
v = getType(index.column());
}
return v;
return {};
}
void CrudModel::loadData()
@ -367,7 +410,7 @@ std::tuple<QString, Pgsql::Params> CrudModel::createInsertQuery(const PendingRow
for (size_t p = 2; p <= data.size(); ++p)
q << ",$" << p;
q << ") RETURNING *";
for (auto e : data) {
for (auto& e : data) {
params.add(e.second, getType(e.first));
}
q.flush();
@ -480,7 +523,6 @@ std::tuple<bool, QString> CrudModel::removeRows(const std::set<IntegerRange<int>
// First delete rows in table
QString delete_statement = createDeleteStatement();
{
db_update_conn.query("BEGIN;");
auto tx = Pgsql::Transaction::startTransaction(db_update_conn);
for (auto range : row_ranges) {
for (int current_row = range.start(); current_row < range.end(); ++current_row) {