Fix insert and delete record buttons not being activated

MKleusberg · MKleusberg · commit b42097c704cf · 2018-12-07T20:36:38.000+01:00
This was introduced in 10b6c34 which fixed another issue. So this is pretty embarassing ;)
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -3571,7 +3571,7 @@ void MainWindow::updateInsertDeleteRecordButton()
     // at least one row to be selected. For the insert button there is an extra rule to disable it when we are browsing a view because inserting
     // into a view isn't supported yet.
     bool isEditable = m_browseTableModel->isEditable() && !db.readOnly();
-    ui->buttonNewRecord->setEnabled(isEditable && m_browseTableModel->pseudoPk().isEmpty());
+    ui->buttonNewRecord->setEnabled(isEditable && !m_browseTableModel->hasPseudoPk());
     ui->buttonDeleteRecord->setEnabled(isEditable && rows != 0);
 
     if(rows > 1)
diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp
@@ -159,10 +159,8 @@ void SqliteTableModel::setQuery(const sqlb::Query& query)
     if(!allOk)
     {
         QString sColumnQuery = QString::fromUtf8("SELECT * FROM %1;").arg(query.table().toString());
-        if(pseudoPk().isEmpty())
+        if(m_query.rowIdColumn().empty())
             m_query.setRowIdColumn("rowid");
-        else
-            m_query.setRowIdColumn(pseudoPk().toStdString());
         m_headers.push_back("rowid");
         m_headers.append(getColumns(nullptr, sColumnQuery, m_vDataTypes));
     }
@@ -803,6 +801,11 @@ void SqliteTableModel::setPseudoPk(const QString& pseudoPk)
     buildQuery();
 }
 
+bool SqliteTableModel::hasPseudoPk() const
+{
+    return !(m_query.rowIdColumn() == "rowid" || m_query.rowIdColumn() == "_rowid_");
+}
+
 bool SqliteTableModel::isEditable() const
 {
     return !m_query.table().isEmpty() &&
diff --git a/src/sqlitetablemodel.h b/src/sqlitetablemodel.h
@@ -98,6 +98,7 @@ class SqliteTableModel : public QAbstractTableModel
 
     // The pseudo-primary key is exclusively for editing views
     void setPseudoPk(const QString& pseudoPk);
+    bool hasPseudoPk() const;
     QString pseudoPk() const { return QString::fromStdString(m_query.rowIdColumn()); }
 
     sqlb::ForeignKeyClause getForeignKeyClause(int column) const;

Original file line number	Diff line number	Diff line change
`@@ -159,10 +159,8 @@ void SqliteTableModel::setQuery(const sqlb::Query& query)`
`159`	`159`	`if(!allOk)`
`160`	`160`	`{`
`161`	`161`	`QString sColumnQuery = QString::fromUtf8("SELECT * FROM %1;").arg(query.table().toString());`
`162`		`- if(pseudoPk().isEmpty())`
	`162`	`+ if(m_query.rowIdColumn().empty())`
`163`	`163`	`m_query.setRowIdColumn("rowid");`
`164`		`- else`
`165`		`- m_query.setRowIdColumn(pseudoPk().toStdString());`
`166`	`164`	`m_headers.push_back("rowid");`
`167`	`165`	`m_headers.append(getColumns(nullptr, sColumnQuery, m_vDataTypes));`
`168`	`166`	`}`
`@@ -803,6 +801,11 @@ void SqliteTableModel::setPseudoPk(const QString& pseudoPk)`
`803`	`801`	`buildQuery();`
`804`	`802`	`}`
`805`	`803`
	`804`	`+bool SqliteTableModel::hasPseudoPk() const`
	`805`	`+{`
	`806`	`+ return !(m_query.rowIdColumn() == "rowid" \|\| m_query.rowIdColumn() == "_rowid_");`
	`807`	`+}`
	`808`	`+`
`806`	`809`	`bool SqliteTableModel::isEditable() const`
`807`	`810`	`{`
`808`	`811`	`return !m_query.table().isEmpty() &&`