mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 11:00:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix view editing

Browse Source 
This was probably broken by f1e01dde8c.

See issue #141.
This commit is contained in:
Martin Kleusberg
2018-12-05 18:11:21 +01:00
parent d8b1ac2c39
commit 10b6c34be6
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/MainWindow.cpp
View File

@@ -713,6 +713,9 @@ void MainWindow::populateTable()
if(only_defaults)
query.selectedColumns().clear();
// Unlock view editing
query.setRowIdColumn(storedData.unlockViewPk.toStdString());
// Apply query
m_browseTableModel->setQuery(query);

21
src/sqlitetablemodel.cpp
View File

@@ -101,7 +101,6 @@ void SqliteTableModel::reset()
m_query.clear();
m_headers.clear();
m_vDataTypes.clear();
m_pseudoPk.clear();
m_mCondFormats.clear();
endResetModel();
@@ -158,7 +157,10 @@ void SqliteTableModel::setQuery(const sqlb::Query& query)
if(!allOk)
{
QString sColumnQuery = QString::fromUtf8("SELECT * FROM %1;").arg(query.table().toString());
m_query.setRowIdColumn("rowid");
if(pseudoPk().isEmpty())
m_query.setRowIdColumn("rowid");
else
m_query.setRowIdColumn(pseudoPk().toStdString());
m_headers.push_back("rowid");
m_headers.append(getColumns(nullptr, sColumnQuery, m_vDataTypes));
}
@@ -167,7 +169,6 @@ void SqliteTableModel::setQuery(const sqlb::Query& query)
std::vector<std::string> column_names;
for(const auto& h : m_headers)
column_names.push_back(h.toStdString());
//column_names.erase(column_names.begin(), column_names.begin()+1);
m_query.setColumNames(column_names);
// Apply new query and update view
@@ -407,7 +408,7 @@ bool SqliteTableModel::setTypedData(const QModelIndex& index, bool isBlob, const
if(oldValue == newValue && oldValue.isNull() == newValue.isNull())
return true;
if(m_db.updateRecord(m_query.table(), m_headers.at(index.column()), cached_row.at(0), newValue, isBlob, m_pseudoPk))
if(m_db.updateRecord(m_query.table(), m_headers.at(index.column()), cached_row.at(0), newValue, isBlob, QString::fromStdString(m_query.rowIdColumn())))
{
cached_row.replace(index.column(), newValue);
if(m_headers.at(index.column()).toStdString() == m_query.rowIdColumn()) {
@@ -546,7 +547,7 @@ bool SqliteTableModel::removeRows(int row, int count, const QModelIndex& parent)
}
}
bool ok = m_db.deleteRecords(m_query.table(), rowids, m_pseudoPk);
bool ok = m_db.deleteRecords(m_query.table(), rowids, QString::fromStdString(m_query.rowIdColumn()));
if (ok) {
beginRemoveRows(parent, row, row + count - 1);
@@ -783,16 +784,16 @@ bool SqliteTableModel::dropMimeData(const QMimeData* data, Qt::DropAction, int r
void SqliteTableModel::setPseudoPk(const QString& pseudoPk)
{
// Do nothing if the value didn't change
if(m_pseudoPk == pseudoPk)
if(m_query.rowIdColumn() == pseudoPk.toStdString())
return;
if(pseudoPk.isEmpty())
{
m_pseudoPk.clear();
m_query.rowIdColumn().clear();
if(m_headers.size())
m_headers[0] = QString::fromStdString(m_query.rowIdColumn());
m_headers[0] = QString("rowid");
} else {
m_pseudoPk = pseudoPk;
m_query.setRowIdColumn(pseudoPk.toStdString());
if(m_headers.size())
m_headers[0] = pseudoPk;
}
@@ -804,7 +805,7 @@ bool SqliteTableModel::isEditable() const
{
return !m_query.table().isEmpty() &&
m_db.isOpen() &&
((m_db.getObjectByName(m_query.table()) && m_db.getObjectByName(m_query.table())->type() == sqlb::Object::Types::Table) || !m_pseudoPk.isEmpty());
((m_db.getObjectByName(m_query.table()) && m_db.getObjectByName(m_query.table())->type() == sqlb::Object::Types::Table) || !m_query.rowIdColumn().empty());
}
void SqliteTableModel::triggerCacheLoad (int row) const

3
src/sqlitetablemodel.h
View File

@@ -99,7 +99,7 @@ public:
// The pseudo-primary key is exclusively for editing views
void setPseudoPk(const QString& pseudoPk);
QString pseudoPk() const { return m_pseudoPk; }
QString pseudoPk() const { return QString::fromStdString(m_query.rowIdColumn()); }
sqlb::ForeignKeyClause getForeignKeyClause(int column) const;
@@ -172,7 +172,6 @@ private:
bool nosync_isBinary(const QModelIndex& index) const;
QString m_sQuery;
QString m_pseudoPk;
QVector<int> m_vDataTypes;
QMap<int, QVector<CondFormat>> m_mCondFormats;
sqlb::Query m_query;