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

Cleanup and new formatting

Browse source
This commit is contained in:
eelke 2022-04-03 09:17:18 +02:00
parent f492c8f9bc
commit 357dc3d114
3 changed files with 105 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pglab/ColumnPage.cpp
View file

@ -30,7 +30,6 @@ ColumnPage::ColumnPage(QWidget *parent)
m_tableView->setModel(m_sortFilterProxy);
m_tableView->horizontalHeader()->setSortIndicator(ColumnTableModel::AttnumCol, Qt::AscendingOrder);
m_tableView->setSortingEnabled(true);
// m_tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
m_sortFilterProxy->sort(ColumnTableModel::AttnumCol, Qt::AscendingOrder);
connect(m_tableView->selectionModel(), &QItemSelectionModel::selectionChanged,
@ -61,11 +60,13 @@ void ColumnPage::tableView_selectionChanged(const QItemSelection &/*selected*/,
QString drops;
QString addsql;
auto iter = rijen.begin();
if (iter != rijen.end()) {
if (iter != rijen.end())
{
auto && col = m_columnModel->column(*iter);
drops = alterTable % "\n DROP COLUMN " % quoteIdent(col.name);
addsql = alterTable % "\n ADD COLUMN " % col.columnDefinition(*m_catalog);
for (++iter; iter != rijen.end(); ++iter) {
for (++iter; iter != rijen.end(); ++iter)
{
auto && col = m_columnModel->column(*iter);
drops += ",\n DROP COLUMN " % quoteIdent(col.name);
addsql += ",\n ADD COLUMN " % col.columnDefinition(*m_catalog);
@ -75,16 +76,17 @@ void ColumnPage::tableView_selectionChanged(const QItemSelection &/*selected*/,
m_definitionView->setPlainText(drops % "\n\n" % addsql);
completeSql += drops % "\n\n" % addsql % "\n\n";
}
for (auto r : rijen) {
for (auto r : rijen)
{
auto && col = m_columnModel->column(r);
auto cs = col.commentStatement(*m_catalog, m_Class.value());
if (!cs.isEmpty()) {
if (!cs.isEmpty())
completeSql += cs % "\n";
}
}
completeSql += "\n-- SQL to correct just the defaults\n";
for (auto r : rijen) {
for (auto r : rijen)
{
auto && col = m_columnModel->column(r);
completeSql += alterTable % " ALTER COLUMN " % quoteIdent(col.name);
if (col.hasdef)
@ -93,7 +95,8 @@ void ColumnPage::tableView_selectionChanged(const QItemSelection &/*selected*/,
completeSql += " DROP DEFAULT;\n";
}
completeSql += "\n-- SQL to correct NULLABLE\n";
for (auto r : rijen) {
for (auto r : rijen)
{
auto && col = m_columnModel->column(r);
completeSql += alterTable % " ALTER COLUMN " % quoteIdent(col.name);
if (col.notnull)