Index: dlg/dlgIndex.cpp =================================================================== --- dlg/dlgIndex.cpp (revision 7497) +++ dlg/dlgIndex.cpp (working copy) @@ -30,22 +30,16 @@ #define txtWhere CTRL_TEXT("txtWhere") #define txtFillFactor CTRL_TEXT("txtFillFactor") -#define btnAddCol CTRL_BUTTON("btnAddCol") -#define btnRemoveCol CTRL_BUTTON("btnRemoveCol") +#define chkDesc CTRL_CHECKBOX("chkDesc") +#define rdbNulls CTRL_RADIOBOX("rdbNulls") - BEGIN_EVENT_TABLE(dlgIndexBase, dlgCollistProperty) EVT_TEXT(XRCID("cbTablespace"), dlgProperty::OnChange) EVT_COMBOBOX(XRCID("cbTablespace"), dlgProperty::OnChange) EVT_TEXT(XRCID("txtFillFactor"), dlgProperty::OnChange) - EVT_BUTTON(XRCID("btnAddCol"), dlgIndexBase::OnAddCol) - EVT_BUTTON(XRCID("btnRemoveCol"), dlgIndexBase::OnRemoveCol) EVT_LIST_ITEM_SELECTED(XRCID("lstColumns"), dlgIndexBase::OnSelectListCol) EVT_COMBOBOX(XRCID("cbColumns"), dlgIndexBase::OnSelectComboCol) -#ifdef __WXMAC__ - EVT_SIZE( dlgIndexBase::OnChangeSize) -#endif END_EVENT_TABLE(); @@ -60,8 +54,6 @@ { index=node; wxASSERT(!table || table->GetMetaType() == PGM_TABLE); - - lstColumns->CreateColumns(0, _("Columns"), wxT(""), 0); } @@ -69,8 +61,6 @@ : dlgCollistProperty(f, frame, resName, colList) { index=0; - - lstColumns->CreateColumns(0, _("Columns"), wxT(""), 0); } @@ -82,7 +72,6 @@ int dlgIndexBase::Go(bool modal) { - int returncode; if (index) { @@ -90,10 +79,6 @@ txtName->Disable(); cbColumns->Disable(); - wxArrayString colsArr = index->GetColumnList(); - for (int colIdx=0,colsCount=colsArr.Count(); colIdxInsertItem(colIdx, colsArr.Item(colIdx), columnFactory.GetIconId()); - if (txtFillFactor) { txtFillFactor->SetValue(index->GetFillFactor()); @@ -116,48 +101,9 @@ btnAddCol->Disable(); btnRemoveCol->Disable(); - returncode = dlgCollistProperty::Go(modal); - - #ifdef __WXMAC__ - wxSizeEvent event(wxSize(GetSize().GetWidth() - 25, GetSize().GetHeight() + 200)); - OnChangeSize(event); - #endif - - return returncode; + return dlgCollistProperty::Go(modal); } - -void dlgIndexBase::OnAddCol(wxCommandEvent &ev) -{ - wxString col=cbColumns->GetValue(); - if (!col.IsEmpty()) - { - lstColumns->InsertItem(lstColumns->GetItemCount(), col, columnFactory.GetIconId()); - cbColumns->Delete(cbColumns->GetCurrentSelection()); - if (cbColumns->GetCount()) - cbColumns->SetSelection(0); - - CheckChange(); - if (!cbColumns->GetCount()) - btnAddCol->Disable(); - } -} - - -void dlgIndexBase::OnRemoveCol(wxCommandEvent &ev) -{ - long pos=lstColumns->GetSelection(); - if (pos >= 0) - { - wxString col=lstColumns->GetItemText(pos); - lstColumns->DeleteItem(pos); - cbColumns->Append(col); - - CheckChange(); - btnRemoveCol->Disable(); - } -} - void dlgIndexBase::OnSelectListCol(wxListEvent &ev) { OnSelectCol(); @@ -185,19 +131,7 @@ btnAddCol->Enable(false); } -#ifdef __WXMAC__ -void dlgIndexBase::OnChangeSize(wxSizeEvent &ev) -{ - lstColumns->SetSize(wxDefaultCoord, wxDefaultCoord, - ev.GetSize().GetWidth(), ev.GetSize().GetHeight() - 350); - if (GetAutoLayout()) - { - Layout(); - } -} -#endif - void dlgIndexBase::CheckChange() { if (index) @@ -215,32 +149,23 @@ } -wxString dlgIndexBase::GetColumns() -{ - wxString sql; - - int pos; - // iterate cols - for (pos=0 ; pos < lstColumns->GetItemCount() ; pos++) - { - if (pos) - sql += wxT(", "); - - sql += qtIdent(lstColumns->GetItemText(pos)); - } - return sql; -} - - BEGIN_EVENT_TABLE(dlgIndex, dlgIndexBase) - EVT_TEXT(XRCID("cbTablespace"), dlgProperty::OnChange) + EVT_BUTTON(XRCID("btnAddCol"), dlgIndex::OnAddCol) + EVT_BUTTON(XRCID("btnRemoveCol"), dlgIndex::OnRemoveCol) EVT_CHECKBOX(XRCID("chkClustered"), dlgProperty::OnChange) + EVT_CHECKBOX(XRCID("chkDesc"), dlgIndex::OnDescChange) +#ifdef __WXMAC__ + EVT_SIZE( dlgIndex::OnChangeSize) +#endif END_EVENT_TABLE(); dlgIndex::dlgIndex(pgaFactory *f, frmMain *frame, pgIndex *index, pgTable *parentNode) : dlgIndexBase(f, frame, wxT("dlgIndex"), index, parentNode) { + lstColumns->AddColumn(_("Column name"), 90); + lstColumns->AddColumn(_("Order"), 40); + lstColumns->AddColumn(_("NULLs Order"), 40); } @@ -272,6 +197,29 @@ } +wxString dlgIndex::GetColumns() +{ + wxString sql; + + int pos; + // iterate cols + for (pos=0 ; pos < lstColumns->GetItemCount() ; pos++) + { + if (pos) + sql += wxT(", "); + + sql += qtIdent(lstColumns->GetItemText(pos)); + if (this->database->BackendMinimumVersion(8, 3)) { + wxString order = lstColumns->GetText(pos, 1); + if (!order.IsEmpty()) sql += wxT(" ") + order; + wxString nullsOrder = lstColumns->GetText(pos, 2); + if (!nullsOrder.IsEmpty()) sql += wxT(" NULLS ") + nullsOrder; + } + } + return sql; +} + + int dlgIndex::Go(bool modal) { if (!connection->BackendMinimumVersion(7, 4)) @@ -280,7 +228,35 @@ if (index) { // edit mode: view only - + + wxArrayString colsArr = index->GetColumnList(); + if (this->database->BackendMinimumVersion(8, 3)) { + wxString colDef, colRest, colName, descDef, nullsDef; + const wxString firstOrder = wxT(" NULLS FIRST"), lastOrder = wxT(" NULLS LAST"), descOrder = wxT(" DESC"); + for (int colIdx=0,colsCount=colsArr.Count(); colIdxInsertItem(colIdx, colDef, columnFactory.GetIconId()); + lstColumns->SetItem(colIdx, 1, descDef); + lstColumns->SetItem(colIdx, 2, nullsDef); + } + } else + for (int colIdx=0,colsCount=colsArr.Count(); colIdxInsertItem(colIdx, colsArr.Item(colIdx), columnFactory.GetIconId()); + cbType->Append(index->GetIndexType()); chkUnique->SetValue(index->GetIsUnique()); chkClustered->SetValue(index->GetIsClustered()); @@ -291,6 +267,8 @@ chkUnique->Disable(); chkConcurrent->Disable(); PrepareTablespace(cbTablespace, index->GetTablespaceOid()); + chkDesc->Disable(); + rdbNulls->Disable(); } else { @@ -312,14 +290,89 @@ if (!this->database->BackendMinimumVersion(8, 2)) chkConcurrent->Disable(); + if (!this->database->BackendMinimumVersion(8, 3)) { + chkDesc->Disable(); + rdbNulls->Disable(); + } + // Add the default tablespace cbTablespace->Insert(_(""), 0, (void *)0); cbTablespace->SetSelection(0); } - return dlgIndexBase::Go(modal); + + int returnCode = dlgIndexBase::Go(modal); + + #ifdef __WXMAC__ + wxSizeEvent event(wxSize(GetSize().GetWidth() - 25, GetSize().GetHeight() + 200)); + OnChangeSize(event); + #endif + + return returnCode; } - + +void dlgIndex::OnAddCol(wxCommandEvent &ev) +{ + wxString colName=cbColumns->GetValue(); + + if (!colName.IsEmpty()) + { + long colIndex = lstColumns->InsertItem(lstColumns->GetItemCount(), colName, columnFactory.GetIconId()); + + if (this->database->BackendMinimumVersion(8, 3)) { + if (chkDesc->GetValue()) { + lstColumns->SetItem(colIndex, 1, wxT("DESC")); + + // not default + if (rdbNulls->GetSelection()==1) + lstColumns->SetItem(colIndex, 2, wxT("LAST")); + } else + if (rdbNulls->GetSelection()==0) + lstColumns->SetItem(colIndex, 2, wxT("FIRST")); + + // back to default value + chkDesc->SetValue(false); + rdbNulls->SetSelection(1); + } + + cbColumns->Delete(cbColumns->GetCurrentSelection()); + if (cbColumns->GetCount()) + cbColumns->SetSelection(0); + + CheckChange(); + if (!cbColumns->GetCount()) + btnAddCol->Disable(); + } +} + + +void dlgIndex::OnRemoveCol(wxCommandEvent &ev) +{ + long pos=lstColumns->GetSelection(); + if (pos >= 0) + { + wxString colName=lstColumns->GetItemText(pos); + + lstColumns->DeleteItem(pos); + cbColumns->Append(colName); + + CheckChange(); + btnRemoveCol->Disable(); + } +} + +#ifdef __WXMAC__ +void dlgIndex::OnChangeSize(wxSizeEvent &ev) +{ + lstColumns->SetSize(wxDefaultCoord, wxDefaultCoord, + ev.GetSize().GetWidth(), ev.GetSize().GetHeight() - 800); + if (GetAutoLayout()) + { + Layout(); + } +} +#endif + wxString dlgIndex::GetSql() { wxString sql; @@ -392,3 +445,10 @@ return obj; } +void dlgIndex::OnDescChange(wxCommandEvent &ev) +{ + if (chkDesc->GetValue()) + rdbNulls->SetSelection(0); + else + rdbNulls->SetSelection(1); +} \ No newline at end of file Index: dlg/dlgIndexConstraint.cpp =================================================================== --- dlg/dlgIndexConstraint.cpp (revision 7497) +++ dlg/dlgIndexConstraint.cpp (working copy) @@ -23,22 +23,48 @@ #include "schema/pgIndexConstraint.h" - #define cbTablespace CTRL_COMBOBOX("cbTablespace") +BEGIN_EVENT_TABLE(dlgIndexConstraint, dlgIndexBase) + EVT_BUTTON(XRCID("btnAddCol"), dlgIndexConstraint::OnAddCol) + EVT_BUTTON(XRCID("btnRemoveCol"), dlgIndexConstraint::OnRemoveCol) +#ifdef __WXMAC__ + EVT_SIZE( dlgIndexConstraint::OnChangeSize) +#endif +END_EVENT_TABLE(); + dlgIndexConstraint::dlgIndexConstraint(pgaFactory *f, frmMain *frame, const wxString &resName, pgIndexBase *index, pgTable *parentNode) : dlgIndexBase(f, frame, resName, index, parentNode) { + lstColumns->CreateColumns(0, _("Columns"), wxT(""), 0); } dlgIndexConstraint::dlgIndexConstraint(pgaFactory *f, frmMain *frame, const wxString &resName, ctlListView *colList) : dlgIndexBase(f, frame, resName, colList) { + lstColumns->CreateColumns(0, _("Columns"), wxT(""), 0); } +wxString dlgIndexConstraint::GetColumns() +{ + wxString sql; + + int pos; + // iterate cols + for (pos=0 ; pos < lstColumns->GetItemCount() ; pos++) + { + if (pos) + sql += wxT(", "); + + sql += qtIdent(lstColumns->GetItemText(pos)); + } + return sql; +} + + int dlgIndexConstraint::Go(bool modal) { PrepareTablespace(cbTablespace); @@ -47,6 +73,10 @@ { pgIndexConstraint *idc=(pgIndexConstraint*)index; + wxArrayString colsArr = index->GetColumnList(); + for (int colIdx=0,colsCount=colsArr.Count(); colIdxInsertItem(colIdx, colsArr.Item(colIdx), columnFactory.GetIconId()); + if (idc->GetTablespaceOid() != 0) cbTablespace->SetKey(idc->GetTablespaceOid()); cbTablespace->Enable(connection->BackendMinimumVersion(8, 0)); @@ -65,10 +95,61 @@ cbTablespace->SetSelection(0); } - return dlgIndexBase::Go(modal); + int returnCode = dlgIndexBase::Go(modal); + + #ifdef __WXMAC__ + wxSizeEvent event(wxSize(GetSize().GetWidth() - 25, GetSize().GetHeight() + 200)); + OnChangeSize(event); + #endif + + return returnCode; } +void dlgIndexConstraint::OnAddCol(wxCommandEvent &ev) +{ + wxString col=cbColumns->GetValue(); + if (!col.IsEmpty()) + { + lstColumns->InsertItem(lstColumns->GetItemCount(), col, columnFactory.GetIconId()); + cbColumns->Delete(cbColumns->GetCurrentSelection()); + if (cbColumns->GetCount()) + cbColumns->SetSelection(0); + + CheckChange(); + if (!cbColumns->GetCount()) + btnAddCol->Disable(); + } +} + + +void dlgIndexConstraint::OnRemoveCol(wxCommandEvent &ev) +{ + long pos=lstColumns->GetSelection(); + if (pos >= 0) + { + wxString col=lstColumns->GetItemText(pos); + lstColumns->DeleteItem(pos); + cbColumns->Append(col); + + CheckChange(); + btnRemoveCol->Disable(); + } +} + +#ifdef __WXMAC__ +void dlgIndexConstraint::OnChangeSize(wxSizeEvent &ev) +{ + lstColumns->SetSize(wxDefaultCoord, wxDefaultCoord, + ev.GetSize().GetWidth(), ev.GetSize().GetHeight() - 350); + if (GetAutoLayout()) + { + Layout(); + } +} +#endif + + wxString dlgIndexConstraint::GetDefinition() { wxString sql; Index: include/dlg/dlgIndex.h =================================================================== --- include/dlg/dlgIndex.h (revision 7497) +++ include/dlg/dlgIndex.h (working copy) @@ -19,6 +19,9 @@ class pgIndex; class pgIndexBase; +#define btnAddCol CTRL_BUTTON("btnAddCol") +#define btnRemoveCol CTRL_BUTTON("btnRemoveCol") + class dlgIndexBase : public dlgCollistProperty { public: @@ -30,20 +33,12 @@ void OnSelectCol(); void CheckChange(); pgObject *GetObject(); - wxString GetColumns(); int Go(bool modal); protected: pgIndexBase *index; private: -#ifdef __WXMAC__ - void OnChangeSize(wxSizeEvent &ev); -#endif - - void OnAddCol(wxCommandEvent &ev); - void OnRemoveCol(wxCommandEvent &ev); - DECLARE_EVENT_TABLE() }; @@ -55,10 +50,19 @@ int Go(bool modal); void CheckChange(); + wxString GetColumns(); wxString GetSql(); pgObject *CreateObject(pgCollection *collection); private: +#ifdef __WXMAC__ + void OnChangeSize(wxSizeEvent &ev); +#endif + + void OnDescChange(wxCommandEvent &ev); + void OnAddCol(wxCommandEvent &ev); + void OnRemoveCol(wxCommandEvent &ev); + DECLARE_EVENT_TABLE() }; Index: include/dlg/dlgIndexConstraint.h =================================================================== --- include/dlg/dlgIndexConstraint.h (revision 7497) +++ include/dlg/dlgIndexConstraint.h (working copy) @@ -34,9 +34,19 @@ int Go(bool modal); wxString GetDefinition(); + wxString GetColumns(); wxString GetSql(); wxString GetHelpPage() const { return wxT("pg/sql-altertable"); } +private: +#ifdef __WXMAC__ + void OnChangeSize(wxSizeEvent &ev); +#endif + + void OnAddCol(wxCommandEvent &ev); + void OnRemoveCol(wxCommandEvent &ev); + + DECLARE_EVENT_TABLE() }; Index: ui/dlgIndex.xrc =================================================================== --- ui/dlgIndex.xrc (revision 7497) +++ ui/dlgIndex.xrc (working copy) @@ -172,6 +172,7 @@ 1 + 3 0 0 @@ -183,15 +184,69 @@ - 5 - 0 + 2 + 3 + 5 + 5 + 1 + 1 + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + - wxGROW|wxALIGN_CENTRE_VERTICAL + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + + FIRST + LAST + + 1 + 1 + + + 4 + + + wxEXPAND|wxALL + 4 + + + + 4 + 0 3,3d