Re: Obsolete "FORCE" option for REINDEX

["Robins Tharakan" <tharakan(at)gmail(dot)com>]

Hi,

Attached is a patch to remove the FORCE option from the Maintenance dialogue box.

Robins

Hi,

I'm just about to leave for FOSDEM so cannot check right now, but my
guess is that you're running a release build, in which for changes to
XRC files to become visible you must run ui/embed-xrc which
regenerates xrcdialogs.cpp from the XRC files.

For testing purposes, a debug build will load the XRC files at
dialogue invocation time so you can edit them, then just re-open the
dialogue.

--
Dave Page

Index: pgadmin/frm/frmMaintenance.cpp
===================================================================
--- pgadmin/frm/frmMaintenance.cpp	(revision 7103)
+++ pgadmin/frm/frmMaintenance.cpp	(working copy)
@@ -37,7 +37,6 @@
 #define chkFreeze               CTRL_CHECKBOX("chkFreeze")
 #define chkAnalyze              CTRL_CHECKBOX("chkAnalyze")
 #define sbxReindexOptions       CTRL_STATICBOX("sbxReindexOptions")
-#define chkForce                CTRL_CHECKBOX("chkForce")
 #define chkRecreate             CTRL_CHECKBOX("chkRecreate")
 #define chkVerbose              CTRL_CHECKBOX("chkVerbose")
 
@@ -102,7 +101,6 @@
 
     bool isReindex = (rbxAction->GetSelection() == 2);
     sbxReindexOptions->Enable(isReindex && object->GetMetaType() == PGM_DATABASE || object->GetMetaType() == PGM_INDEX || object->GetMetaType() == PGM_PRIMARYKEY || object->GetMetaType() == PGM_UNIQUE);
-    chkForce->Enable(isReindex && object->GetMetaType() == PGM_DATABASE);
     chkRecreate->Enable(isReindex && object->GetMetaType() == PGM_INDEX);
 }
 
@@ -161,8 +159,6 @@
                 {
                     sql = wxT("REINDEX ") + object->GetTypeName().Upper()
                         + wxT(" ") + object->GetQuotedFullIdentifier();
-                    if (chkForce->GetValue())
-                        sql += wxT(" FORCE");
                 }
             }
             break;
Index: pgadmin/ui/frmMaintenance.xrc
===================================================================
--- pgadmin/ui/frmMaintenance.xrc	(revision 7103)
+++ pgadmin/ui/frmMaintenance.xrc	(working copy)
@@ -49,13 +49,9 @@
                 <pos>100,40d</pos>
                 <size>85,40d</size>
               </object>
-              <object class="wxCheckBox" name="chkForce">
-                <label>FORCE</label>
-                <pos>113,52d</pos>
-              </object>
               <object class="wxCheckBox" name="chkRecreate">
                 <label>RECREATE</label>
-                <pos>113,64d</pos>
+                <pos>113,52d</pos>
               </object>
               <object class="wxCheckBox" name="chkVerbose">
                 <label>Verbose messages</label>
@@ -118,4 +114,4 @@
       <growablerows>0</growablerows>
     </object>
   </object>
-</resource>
\ No newline at end of file
+</resource>