SVN Commit by andreas: r4159 - trunk/pgadmin3/src/dlg

Author: andreas
Date: 2005-05-08 18:30:50 +0100 (Sun, 08 May 2005)
New Revision: 4159

Modified:
   trunk/pgadmin3/src/dlg/dlgTable.cpp
Log:
enable SET WITHOUT OIDS

Modified: trunk/pgadmin3/src/dlg/dlgTable.cpp
===================================================================
--- trunk/pgadmin3/src/dlg/dlgTable.cpp    2005-05-08 17:27:53 UTC (rev 4158)
+++ trunk/pgadmin3/src/dlg/dlgTable.cpp    2005-05-08 17:30:50 UTC (rev 4159)
@@ -58,6 +58,7 @@
     EVT_CHECKBOX(XRCID("chkHasOids"),               dlgProperty::OnChange)
     EVT_TEXT(XRCID("cbTablespace"),                 dlgProperty::OnChange)
     EVT_COMBOBOX(XRCID("cbTablespace"),             dlgProperty::OnChange)
+    EVT_CHECKBOX(XRCID("chkHasOids"),               dlgProperty::OnChange)
     EVT_TEXT(XRCID("cbTables"),                     dlgTable::OnChangeTable)
     EVT_BUTTON(XRCID("btnAddTable"),                dlgTable::OnAddTable)
     EVT_BUTTON(XRCID("btnRemoveTable"),             dlgTable::OnRemoveTable)
@@ -126,7 +127,7 @@
         btnAddTable->Disable();
         lbTables->Disable();
         cbTables->Disable();
-        chkHasOids->Disable();
+        chkHasOids->Enable(table->GetHasOids() && connection->BackendMinimumVersion(8, 0));
         cbTablespace->Enable(connection->BackendMinimumVersion(7, 5));

         wxCookieType cookie;
@@ -387,10 +388,10 @@
             sql += wxT("ALTER TABLE ") + tabname
                 +  wxT(" DROP CONSTRAINT ") + qtIdent(definition) + wxT(";\n");
         }
-        if (hasPK && chkHasOids->GetValue() != table->GetHasOids())
+        if (chkHasOids->GetValue() != table->GetHasOids())
         {
             sql += wxT("ALTER TABLE ") + tabname
-                +  wxT(" WITHOUT OIDS;\n");
+                +  wxT(" SET WITHOUT OIDS;\n");
         }
         if (cbTablespace->GetValue() != table->GetTablespace())
         {