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

Merge branch 'master' of ssh://git@gitlab.com:/eelke/pgLab.git

Browse source
This commit is contained in:
eelke 2019-10-06 09:34:45 +02:00
commit 4ea388cad7
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pglab/DatabaseWindow.cpp
View file

@ -389,7 +389,7 @@ void DatabaseWindow::on_actionCopy_triggered()
} }
else { else {
const QMetaObject *meta = w->metaObject(); const QMetaObject *meta = w->metaObject();
int i = meta->indexOfSlot("copy"); int i = meta->indexOfMethod("copy()");
if (i != -1) { if (i != -1) {
QMetaMethod method = meta->method(i); QMetaMethod method = meta->method(i);
method.invoke(w, Qt::AutoConnection); method.invoke(w, Qt::AutoConnection);

1
pglab/widgets/CatalogConstraintPage.cpp
View file

@ -26,6 +26,7 @@ void CatalogConstraintPage::setFilter(const std::optional<PgClass> &cls)
{ {
m_constraintModel->setData(m_catalog, cls); m_constraintModel->setData(m_catalog, cls);
m_tableView->resizeColumnsToContents(); m_tableView->resizeColumnsToContents();
m_definitionView->setPlainText({});
} }
void CatalogConstraintPage::tableView_selectionChanged(const QItemSelection &/*selected*/, const QItemSelection &/*deselected*/) void CatalogConstraintPage::tableView_selectionChanged(const QItemSelection &/*selected*/, const QItemSelection &/*deselected*/)

1
pglab/widgets/CatalogIndexPage.cpp
View file

@ -26,6 +26,7 @@ void CatalogIndexPage::setFilter(const std::optional<PgClass> &cls)
{ {
m_indexModel->setData(m_catalog, cls); m_indexModel->setData(m_catalog, cls);
m_tableView->resizeColumnsToContents(); m_tableView->resizeColumnsToContents();
m_definitionView->setPlainText({});
} }
void CatalogIndexPage::tableView_selectionChanged(const QItemSelection &/*selected*/, const QItemSelection &/*deselected*/) void CatalogIndexPage::tableView_selectionChanged(const QItemSelection &/*selected*/, const QItemSelection &/*deselected*/)

12
pglablib/catalog/PgTrigger.cpp
View file

@ -91,12 +91,18 @@ QString PgTrigger::event() const
QString event; QString event;
if (type & TriggerTypeInsert) if (type & TriggerTypeInsert)
event += "INSERT "; event += "INSERT ";
if (type & TriggerTypeUpdate) if (type & TriggerTypeUpdate) {
if (!event.isEmpty()) event += "OR ";
event += "UPDATE "; event += "UPDATE ";
if (type & TriggerTypeDelete) }
if (type & TriggerTypeDelete) {
if (!event.isEmpty()) event += "OR ";
event += "DELETE "; event += "DELETE ";
if (type & TriggerTypeTruncate) }
if (type & TriggerTypeTruncate) {
if (!event.isEmpty()) event += "OR ";
event += "TRUNCATE"; event += "TRUNCATE";
}
return event.trimmed(); return event.trimmed();
} }