Basic support for update in Crud implementation, error reporting and transfering data to modified set is still missing.
This commit is contained in:
eelke
parent
3fb32f1200
commit
d626c19e14
15 changed files with 530 additions and 83 deletions
|
|
@ -7,17 +7,19 @@
|
|||
#include "GlobalIoService.h"
|
||||
#include "SqlFormattingUtils.h"
|
||||
#include "WorkManager.h"
|
||||
#include "Pgsql_oids.h"
|
||||
#include <QtConcurrent>
|
||||
#include <QFuture>
|
||||
#include <QFutureWatcher>
|
||||
#include "Pgsql_oids.h"
|
||||
|
||||
#include "Pgsql_Params.h"
|
||||
#include <string>
|
||||
|
||||
CrudModel::CrudModel(ASyncWindow *async_window)
|
||||
: m_asyncWindow(async_window)
|
||||
, m_dbConn(*getGlobalAsioIoService())
|
||||
{
|
||||
qDebug("CrudModel created");
|
||||
connect(&m_dbConn, &ASyncDBConnection::onStateChanged, this, &CrudModel::connectionStateChanged);
|
||||
}
|
||||
|
||||
|
|
@ -26,7 +28,6 @@ CrudModel::~CrudModel()
|
|||
m_dbConn.closeConnection();
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Strategy
|
||||
* when ordered by primary key, offset and limit work very quickly so we can get away with not loading
|
||||
|
|
@ -61,13 +62,13 @@ QVariant CrudModel::headerData(int section, Qt::Orientation orientation, int rol
|
|||
|
||||
|
||||
// Basic functionality:
|
||||
int CrudModel::rowCount(const QModelIndex &parent) const
|
||||
int CrudModel::rowCount(const QModelIndex &/*parent*/) const
|
||||
{
|
||||
|
||||
return m_roData ? m_roData->rows() : 0;
|
||||
}
|
||||
|
||||
int CrudModel::columnCount(const QModelIndex &parent) const
|
||||
int CrudModel::columnCount(const QModelIndex &/*parent*/) const
|
||||
{
|
||||
return m_roData ? m_roData->cols() : 0;
|
||||
}
|
||||
|
|
@ -77,40 +78,82 @@ Oid CrudModel::getType(int column) const
|
|||
return m_roData ? m_roData->type(column) : InvalidOid;
|
||||
}
|
||||
|
||||
QVariant CrudModel::getData(const QModelIndex &index) const
|
||||
CrudModel::Value CrudModel::getData(const QModelIndex &index) const
|
||||
{
|
||||
QVariant r;
|
||||
Value value;
|
||||
if (m_roData) {
|
||||
int rij = index.row();
|
||||
int col = index.column();
|
||||
if (m_roData->null(col, rij)) {
|
||||
r = "null";
|
||||
}
|
||||
else {
|
||||
Oid o = m_roData->type(col);
|
||||
auto value = m_roData->get(col, rij);
|
||||
switch (o) {
|
||||
case Pgsql::bool_oid:
|
||||
r = bool(value); //s = (s == "t") ? "TRUE" : "FALSE";
|
||||
break;
|
||||
default: {
|
||||
QString s = value;
|
||||
if (s.length() > 256) {
|
||||
s.truncate(256);
|
||||
}
|
||||
r = s;
|
||||
}
|
||||
|
||||
//Oid o = m_roData->type(col);
|
||||
// First see if we have buffered editted values that still need saving
|
||||
boost::optional<Value> val = m_pendingRowList.getValue(col, rij);
|
||||
if (!val) {
|
||||
// No pending save have a look if we have modified saved data in the modified list
|
||||
auto find_res = m_modifiedRowList.find(rij);
|
||||
if (find_res != m_modifiedRowList.end()) {
|
||||
val = find_res->second.data()[col];
|
||||
}
|
||||
}
|
||||
|
||||
//Value value;
|
||||
// If we did not have pending or modified data
|
||||
if (!val) {
|
||||
// Then we are going to read the original data.
|
||||
if (!m_roData->null(col, rij)) {
|
||||
value = std::string(m_roData->val(col, rij));
|
||||
}
|
||||
}
|
||||
else {
|
||||
value = *val;
|
||||
}
|
||||
}
|
||||
return r;
|
||||
return value;
|
||||
}
|
||||
|
||||
QVariant CrudModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
QVariant v;
|
||||
if (role == Qt::EditRole || role == Qt::DisplayRole) {
|
||||
v = getData(index);
|
||||
if (role == Qt::EditRole) {
|
||||
// int row = index.row();
|
||||
// if (m_pendingChanges.needsToSave(row)) {
|
||||
//// if (savePendingChanges())
|
||||
//// startEditingRow();
|
||||
// }
|
||||
auto value = getData(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());
|
||||
v = s;
|
||||
// }
|
||||
}
|
||||
|
||||
}
|
||||
else if (role == Qt::DisplayRole) {
|
||||
auto value = getData(index);
|
||||
if (value) {
|
||||
Oid o = m_roData->type(index.column());
|
||||
if (o == Pgsql::bool_oid) {
|
||||
if (value)
|
||||
v = *value == "t"; //s = (s == "t") ? "TRUE" : "FALSE";
|
||||
else
|
||||
v = "null";
|
||||
}
|
||||
else {
|
||||
QString s = QString::fromUtf8(value->c_str());
|
||||
if (s.length() > 256) {
|
||||
s.truncate(256);
|
||||
}
|
||||
v = s;
|
||||
}
|
||||
}
|
||||
else {
|
||||
v = "null";
|
||||
}
|
||||
}
|
||||
else if (role == Qt::UserRole) {
|
||||
v = getType(index.column());
|
||||
|
|
@ -176,3 +219,163 @@ Qt::ItemFlags CrudModel::flags(const QModelIndex &) const
|
|||
{
|
||||
return Qt::ItemIsSelectable + Qt::ItemIsEditable + Qt::ItemIsEnabled;
|
||||
}
|
||||
|
||||
bool CrudModel::setData(const QModelIndex &index, const QVariant &value, int role)
|
||||
{
|
||||
if (role == Qt::EditRole) {
|
||||
int row = index.row();
|
||||
int col = index.column();
|
||||
//m_pendingRowList.getRow(row);
|
||||
|
||||
Value val;
|
||||
// Oid o = m_roData->type(index.column());
|
||||
// if (o == Pgsql::bool_oid) {
|
||||
// val = value.Bool ? "t" : "f";
|
||||
// }
|
||||
// else {
|
||||
std::string s = value.toString().toUtf8().data();
|
||||
if (!s.empty()) {
|
||||
if (s == "''")
|
||||
s.clear();
|
||||
val = s;
|
||||
}
|
||||
// }
|
||||
m_pendingRowList.setValue(col, row, val);
|
||||
|
||||
emit dataChanged(index, index, QVector<int>() << role);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
const CrudModel::ModifiedRow* CrudModel::getModifiedRow(int row) const
|
||||
{
|
||||
auto iter = m_modifiedRowList.find(row);
|
||||
if (iter == m_modifiedRowList.end())
|
||||
return nullptr;
|
||||
else
|
||||
return &iter->second;
|
||||
}
|
||||
|
||||
CrudModel::PKeyValues CrudModel::getPKeyForRow(int row) const
|
||||
{
|
||||
PKeyValues values;
|
||||
values.reserve(m_primaryKey->fkey.size());
|
||||
|
||||
auto mod_row = getModifiedRow(row);
|
||||
if (mod_row){
|
||||
for (auto attnum : m_primaryKey->key) {
|
||||
int col = attnum - 1; // Assume column ordering matches table, also we assume know special columns like oid are shown
|
||||
values.push_back(*(mod_row->data()[col]));
|
||||
}
|
||||
}
|
||||
else {
|
||||
for (auto attnum : m_primaryKey->key) {
|
||||
int col = attnum - 1; // Assume column ordering matches table, also we assume know special columns like oid are shown
|
||||
values.push_back(m_roData->get(col, row).c_str());
|
||||
}
|
||||
}
|
||||
|
||||
return values;
|
||||
}
|
||||
|
||||
QString CrudModel::columnName(int col) const
|
||||
{
|
||||
return m_roData->getColName(col);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void CrudModel::updateRow(const PendingRow &pending_row)
|
||||
{
|
||||
auto pkey_values = getPKeyForRow(pending_row.row());
|
||||
|
||||
QString buffer;
|
||||
QTextStream q(&buffer);
|
||||
q << "UPDATE ";
|
||||
q << genFQTableName(*m_database->catalogue(), m_table);
|
||||
q << " AS d\n SET ";
|
||||
|
||||
auto data = pending_row.data();
|
||||
Pgsql::Params params;
|
||||
if (!data.empty()) {
|
||||
int param = 0;
|
||||
for (auto e : data) {
|
||||
if (param > 0)
|
||||
q << ",";
|
||||
|
||||
q << quoteIdent(columnName(e.first))
|
||||
<< "=$" << ++param;
|
||||
|
||||
if (e.second)
|
||||
params.add(e.second->c_str(), getType(e.first));
|
||||
else
|
||||
params.add(nullptr, getType(e.first));
|
||||
}
|
||||
|
||||
q << "\nWHERE ";
|
||||
int i = 0;
|
||||
for (auto attnum : m_primaryKey->key) {
|
||||
int col = attnum - 1; // Assume column ordering matches table, also we assume know special columns like oid are shown
|
||||
params.add(pkey_values[i].c_str(), getType(col));
|
||||
if (i > 0)
|
||||
q << " AND ";
|
||||
q << quoteIdent(columnName(col)) << "=$" << ++param;
|
||||
++i;
|
||||
}
|
||||
q << "\nRETURNING *";
|
||||
q.flush();
|
||||
|
||||
|
||||
m_dbConn.send(buffer.toUtf8().data(), params,
|
||||
[this] (Expected<std::shared_ptr<Pgsql::Result>> result, qint64) {
|
||||
|
||||
} );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
bool CrudModel::savePendingChanges()
|
||||
{
|
||||
// need to start async store of changes
|
||||
|
||||
// modified results are only known after updates/inserts have returned the new values
|
||||
// (new values can be modified by triggers and such things)
|
||||
|
||||
// do we leave panding changes in the list until async task complete? But then we do not know which
|
||||
// ones we are storing because user can add new ones.
|
||||
|
||||
// We could also clear the pending list and keep a copy in the async task but then display would revert back
|
||||
// to original values until save has completed.
|
||||
|
||||
// Moving them to modified list doesn't seem a good idea either because we would have to undo the changes
|
||||
// when the save fails.
|
||||
|
||||
|
||||
|
||||
// PendingRowList copy = m_pendingRowList;
|
||||
//
|
||||
|
||||
|
||||
for (const auto& row : m_pendingRowList) {
|
||||
// int row_number = row.first;
|
||||
// if (row_number >= 0) {
|
||||
//// update
|
||||
// }
|
||||
updateRow(row.second);
|
||||
|
||||
}
|
||||
m_pendingRowList.clear();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CrudModel::submit()
|
||||
{
|
||||
return savePendingChanges();
|
||||
}
|
||||
|
||||
void CrudModel::revert()
|
||||
{
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue