diff --git a/pgadmin/dlg/dlgIndex.cpp b/pgadmin/dlg/dlgIndex.cpp index c12b006..0077c38 100644 --- a/pgadmin/dlg/dlgIndex.cpp +++ b/pgadmin/dlg/dlgIndex.cpp @@ -601,7 +601,7 @@ wxString dlgIndex::GetSql() else { if (connection->BackendMinimumVersion(8, 2) && txtFillFactor->GetValue().Length() > 0) - sql += wxT("ALTER INDEX ") + qtIdent(index->GetSchema()->GetSchema()->GetName()) + wxT(".") + sql += wxT("ALTER INDEX ") + qtIdent(index->GetSchema()->GetName()) + wxT(".") + qtIdent(index->GetName()) + wxT("\n SET (FILLFACTOR=") + txtFillFactor->GetValue() + wxT(");\n"); @@ -609,12 +609,12 @@ wxString dlgIndex::GetSql() { if (index->GetName() != txtName->GetValue() && !txtName->GetValue().IsEmpty()) - sql += wxT("ALTER INDEX ") + qtIdent(index->GetSchema()->GetSchema()->GetName()) + wxT(".") + sql += wxT("ALTER INDEX ") + qtIdent(index->GetSchema()->GetName()) + wxT(".") + qtIdent(index->GetName()) + wxT("\n RENAME TO ") + qtIdent(txtName->GetValue()) + wxT(";\n"); if (cbTablespace->GetOIDKey() != index->GetTablespaceOid()) - sql += wxT("ALTER INDEX ") + qtIdent(index->GetSchema()->GetSchema()->GetName()) + wxT(".") + qtIdent(name) + sql += wxT("ALTER INDEX ") + qtIdent(index->GetSchema()->GetName()) + wxT(".") + qtIdent(name) + wxT("\n SET TABLESPACE ") + qtIdent(cbTablespace->GetValue()) + wxT(";\n"); } diff --git a/pgadmin/dlg/dlgIndexConstraint.cpp b/pgadmin/dlg/dlgIndexConstraint.cpp index ce04710..462c48c 100644 --- a/pgadmin/dlg/dlgIndexConstraint.cpp +++ b/pgadmin/dlg/dlgIndexConstraint.cpp @@ -569,14 +569,14 @@ wxString dlgIndexConstraint::GetSql() } if (connection->BackendMinimumVersion(8, 0) && cbTablespace->GetOIDKey() != index->GetTablespaceOid()) { - sql += wxT("ALTER INDEX ") + index->GetSchema()->GetSchema()->GetQuotedIdentifier() + wxT(".") + qtIdent(name) + sql += wxT("ALTER INDEX ") + index->GetSchema()->GetQuotedIdentifier() + wxT(".") + qtIdent(name) + wxT("\n SET TABLESPACE ") + qtIdent(cbTablespace->GetValue()) + wxT(";\n"); } if (txtFillFactor->GetValue().Trim().Length() > 0 && txtFillFactor->GetValue() != index->GetFillFactor()) { - sql += wxT("ALTER INDEX ") + index->GetSchema()->GetSchema()->GetQuotedIdentifier() + wxT(".") + qtIdent(name) + sql += wxT("ALTER INDEX ") + index->GetSchema()->GetQuotedIdentifier() + wxT(".") + qtIdent(name) + wxT("\n SET (FILLFACTOR=") + txtFillFactor->GetValue() + wxT(");\n"); } diff --git a/pgadmin/schema/pgIndex.cpp b/pgadmin/schema/pgIndex.cpp index ba36469..dde8537 100644 --- a/pgadmin/schema/pgIndex.cpp +++ b/pgadmin/schema/pgIndex.cpp @@ -102,7 +102,7 @@ wxString pgIndexBase::GetTranslatedMessage(int kindOfMessage) const bool pgIndexBase::DropObject(wxFrame *frame, ctlTree *browser, bool cascaded) { - wxString sql = wxT("DROP INDEX ") + this->GetSchema()->GetSchema()->GetQuotedIdentifier() + wxT(".") + this->GetQuotedIdentifier(); + wxString sql = wxT("DROP INDEX ") + this->GetSchema()->GetQuotedIdentifier() + wxT(".") + this->GetQuotedIdentifier(); if (cascaded) sql += wxT(" CASCADE"); return GetDatabase()->ExecuteVoid(sql);