Author: andreas
Date: 2005-11-20 15:52:40 +0000 (Sun, 20 Nov 2005)
New Revision: 4745
Modified:
trunk/pgadmin3/CHANGELOG.txt
trunk/pgadmin3/src/ui/dlgForeignKey.xrc
trunk/pgadmin3/src/ui/xrcDialogs.cpp
Log:
Add missing NO ACTION FK constraint
Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt 2005-11-16 21:57:28 UTC (rev 4744)
+++ trunk/pgadmin3/CHANGELOG.txt 2005-11-20 15:52:40 UTC (rev 4745)
@@ -17,6 +17,7 @@
</ul>
<br>
<ul>
+ <li>2005-11-20 AP Add missing NO ACTION FK constraint
<li>2005-11-11 AP leave pre-1.5 server config settings untouched
<li>2005-11-10 AP Configurable indent in ctlSqlBox
<li>2005-11-10 AP 1.4.1 Fix role rename (r: Antonio)
Modified: trunk/pgadmin3/src/ui/dlgForeignKey.xrc
===================================================================
--- trunk/pgadmin3/src/ui/dlgForeignKey.xrc 2005-11-16 21:57:28 UTC (rev 4744)
+++ trunk/pgadmin3/src/ui/dlgForeignKey.xrc 2005-11-20 15:52:40 UTC (rev 4745)
@@ -8,128 +8,175 @@
<object class="wxPanel" name="pnlProperties">
<object class="wxStaticText" name="stName">
+
<label>Name</label>
+
<pos>5,7d</pos>
</object>
<object class="wxTextCtrl" name="txtName">
+
<pos>70,5d</pos>
+
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stReferences">
+
<label>References</label>
+
<pos>5,22d</pos>
</object>
<object class="wxComboBox" name="cbReferences">
+
<content/>
+
<pos>70,20d</pos>
+
<size>135,12d</size>
+
<style>wxCB_READONLY|wxCB_DROPDOWN</style>
</object>
<object class="wxStaticText" name="stDeferrable">
+
<label>Deferrable</label>
+
<pos>5,37d</pos>
</object>
<object class="wxCheckBox" name="chkDeferrable">
+
<label></label>
+
<pos>70,35d</pos>
+
<size>13,12d</size>
</object>
<object class="wxStaticText" name="stDeferred">
+
<label>Deferred</label>
+
<pos>5,49d</pos>
</object>
<object class="wxCheckBox" name="chkDeferred">
+
<label></label>
+
<pos>70,47d</pos>
+
<size>13,12d</size>
</object>
<object class="wxStaticText" name="stMatchFull">
+
<label>Match full</label>
+
<pos>5,61d</pos>
</object>
<object class="wxCheckBox" name="chkMatchFull">
+
<label></label>
+
<pos>70,59d</pos>
+
<size>13,12d</size>
</object>
<object class="wxStaticText" name="stAutoIndex">
+
<label>Auto FK index</label>
+
<pos>5,73d</pos>
</object>
<object class="wxCheckBox" name="chkAutoIndex">
+
<label></label>
+
<checked>1</checked>
+
<pos>70,71d</pos>
+
<size>13,12d</size>
</object>
<object class="wxStaticText" name="stIndexName">
+
<label>FK index name</label>
+
<pos>5,88d</pos>
</object>
<object class="wxTextCtrl" name="txtIndexName">
+
<pos>70,86d</pos>
+
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stComment">
+
<label>Comment</label>
+
<pos>5,103d</pos>
</object>
<object class="wxTextCtrl" name="txtComment">
+
<pos>70,101d</pos>
+
<size>135,79d</size>
+
<style>wxTE_MULTILINE</style>
</object>
<object class="wxStaticText" name="stClusterSet">
+
<label>Use replication</label>
+
<pos>5,185d</pos>
</object>
<object class="wxComboBox" name="cbClusterSet">
+
<content/>
+
<pos>70,183d</pos>
+
<size>135,12d</size>
+
<style>wxCB_READONLY|wxCB_DROPDOWN</style>
</object>
</object>
+
<selected>1</selected>
</object>
<pos>2,2d</pos>
@@ -142,17 +189,22 @@
<object class="sizeritem">
<object class="wxListCtrl" name="lstColumns">
+
<pos>5,5d</pos>
+
<style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
</object>
+
<flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxGROW</flag>
+
<border>2</border>
</object>
<object class="spacer">
+
<size>3,3d</size>
</object>
<object class="sizeritem">
@@ -160,75 +212,96 @@
<cols>3</cols>
<object class="spacer">
+
<size>3,3d</size>
</object>
<object class="sizeritem">
<object class="wxStaticText" name="stColumns">
+
<label>Local column</label>
+
<pos>5,152d</pos>
</object>
+
<flag>wxGROW|wxALIGN_CENTRE_VERTICAL</flag>
</object>
<object class="sizeritem">
<object class="wxComboBox" name="cbColumns">
+
<content/>
+
<pos>70,150d</pos>
+
<size>135,12d</size>
+
<style>wxCB_READONLY|wxCB_DROPDOWN</style>
</object>
</object>
<object class="spacer">
+
<size>3,3d</size>
</object>
<object class="spacer">
+
<size>3,3d</size>
</object>
<object class="spacer">
+
<size>3,3d</size>
</object>
<object class="spacer">
+
<size>3,3d</size>
</object>
<object class="sizeritem">
<object class="wxStaticText" name="stRefColumns">
+
<label>Referencing</label>
+
<pos>5,167d</pos>
</object>
+
<flag>wxGROW|wxALIGN_CENTRE_VERTICAL</flag>
</object>
<object class="sizeritem">
<object class="wxComboBox" name="cbRefColumns">
+
<content/>
+
<pos>70,165d</pos>
+
<size>135,12d</size>
+
<style>wxCB_READONLY|wxCB_DROPDOWN</style>
</object>
</object>
<growablecols>1</growablecols>
</object>
+
<flag>wxTOP|wxBOTTOM|wxGROW</flag>
</object>
<object class="spacer">
+
<size>5,5d</size>
</object>
<object class="sizeritem">
@@ -236,37 +309,45 @@
<cols>4</cols>
<object class="spacer">
+
<size>3,3d</size>
</object>
<object class="sizeritem">
<object class="wxButton" name="btnAddRef">
+
<label>Add</label>
+
<pos>95,181d</pos>
</object>
</object>
<object class="spacer">
+
<size>3,3d</size>
</object>
<object class="sizeritem">
<object class="wxButton" name="btnRemoveRef">
+
<label>Remove</label>
+
<pos>155,181d</pos>
</object>
</object>
<growablecols>0</growablecols>
</object>
+
<flag>wxTOP|wxGROW</flag>
</object>
<growablecols>0</growablecols>
<growablerows>0</growablerows>
<object class="spacer">
+
<size>2,2d</size>
</object>
</object>
@@ -277,36 +358,48 @@
<object class="wxPanel" name="pnlAction">
<object class="wxRadioBox" name="rbOnUpdate">
+
<label>On Update</label>
+
<content>
+ <item>NO ACTION</item>
<item>RESTRICT</item>
<item>CASCADE</item>
<item>SET NULL</item>
<item>SET DEFAULT</item>
</content>
+
<pos>5,24d</pos>
+
<dimension>1</dimension>
+
<style>wxRA_SPECIFY_COLS</style>
</object>
<object class="wxRadioBox" name="rbOnDelete">
+
<label>On Delete</label>
+
<content>
+ <item>NO ACTION</item>
<item>RESTRICT</item>
<item>CASCADE</item>
<item>SET NULL</item>
<item>SET DEFAULT</item>
</content>
+
<pos>106,24d</pos>
+
<dimension>1</dimension>
+
<style>wxRA_SPECIFY_COLS</style>
</object>
</object>
@@ -314,22 +407,29 @@
</object>
<object class="wxButton" name="wxID_HELP">
+
<label>Help</label>
+
<pos>2,220d</pos>
</object>
<object class="wxButton" name="wxID_OK">
+
<label>OK</label>
+
<default>1</default>
+
<pos>113,220d</pos>
</object>
<object class="wxButton" name="wxID_CANCEL">
+
<label>Cancel</label>
+
<pos>166,220d</pos>
</object>
<size>218,238d</size>
Modified: trunk/pgadmin3/src/ui/xrcDialogs.cpp
===================================================================
--- trunk/pgadmin3/src/ui/xrcDialogs.cpp 2005-11-16 21:57:28 UTC (rev 4744)
+++ trunk/pgadmin3/src/ui/xrcDialogs.cpp 2005-11-20 15:52:40 UTC (rev 4745)
@@ -1807,7 +1807,7 @@
32,60,47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,117,114,99,101,
62,10};
-static size_t xml_res_size_9 = 8639;
+static size_t xml_res_size_9 = 8713;
static unsigned char xml_res_file_9[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,73,83,79,45,56,56,53,57,45,49,34,63,62,
@@ -2150,61 +2150,64 @@
34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,79,
110,32,85,112,100,97,116,101,60,47,108,97,98,101,108,62,10,32,32,32,32,
32,32,32,32,32,32,32,32,60,99,111,110,116,101,110,116,62,10,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,82,69,83,84,82,73,67,
-84,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-60,105,116,101,109,62,67,65,83,67,65,68,69,60,47,105,116,101,109,62,10,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,83,69,84,
-32,78,85,76,76,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,60,105,116,101,109,62,83,69,84,32,68,69,70,65,85,76,84,60,47,
-105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,47,99,111,
-110,116,101,110,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
-115,62,53,44,50,52,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,
-32,32,32,32,60,100,105,109,101,110,115,105,111,110,62,49,60,47,100,105,
-109,101,110,115,105,111,110,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
-115,116,121,108,101,62,119,120,82,65,95,83,80,69,67,73,70,89,95,67,79,76,
-83,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,
-111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,
-101,99,116,32,99,108,97,115,115,61,34,119,120,82,97,100,105,111,66,111,
-120,34,32,110,97,109,101,61,34,114,98,79,110,68,101,108,101,116,101,34,
-62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,79,110,
-32,68,101,108,101,116,101,60,47,108,97,98,101,108,62,10,32,32,32,32,32,
-32,32,32,32,32,32,32,60,99,111,110,116,101,110,116,62,10,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,82,69,83,84,82,73,67,84,
-60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,
-105,116,101,109,62,67,65,83,67,65,68,69,60,47,105,116,101,109,62,10,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,83,69,84,32,
-78,85,76,76,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,60,105,116,101,109,62,83,69,84,32,68,69,70,65,85,76,84,60,47,105,
-116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,47,99,111,110,
-116,101,110,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
-62,49,48,54,44,50,52,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,
-32,32,32,32,60,100,105,109,101,110,115,105,111,110,62,49,60,47,100,105,
-109,101,110,115,105,111,110,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
-115,116,121,108,101,62,119,120,82,65,95,83,80,69,67,73,70,89,95,67,79,76,
-83,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,
-111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,47,111,98,106,101,
-99,116,62,10,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,
-32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,
-116,32,99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,
-97,109,101,61,34,119,120,73,68,95,72,69,76,80,34,62,10,32,32,32,32,32,32,
-60,108,97,98,101,108,62,72,101,108,112,60,47,108,97,98,101,108,62,10,32,
-32,32,32,32,32,60,112,111,115,62,50,44,50,50,48,100,60,47,112,111,115,62,
-10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,
-106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,
-34,32,110,97,109,101,61,34,119,120,73,68,95,79,75,34,62,10,32,32,32,32,
-32,32,60,108,97,98,101,108,62,79,75,60,47,108,97,98,101,108,62,10,32,32,
-32,32,32,32,60,100,101,102,97,117,108,116,62,49,60,47,100,101,102,97,117,
-108,116,62,10,32,32,32,32,32,32,60,112,111,115,62,49,49,51,44,50,50,48,
+32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,78,79,32,65,67,84,73,
+79,78,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,60,105,116,101,109,62,82,69,83,84,82,73,67,84,60,47,105,116,101,109,
+62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,67,
+65,83,67,65,68,69,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,60,105,116,101,109,62,83,69,84,32,78,85,76,76,60,47,105,
+116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,
+101,109,62,83,69,84,32,68,69,70,65,85,76,84,60,47,105,116,101,109,62,10,
+32,32,32,32,32,32,32,32,32,32,32,32,60,47,99,111,110,116,101,110,116,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,50,52,100,
+60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,100,105,
+109,101,110,115,105,111,110,62,49,60,47,100,105,109,101,110,115,105,111,
+110,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,
+119,120,82,65,95,83,80,69,67,73,70,89,95,67,79,76,83,60,47,115,116,121,
+108,101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,
+62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,
+97,115,115,61,34,119,120,82,97,100,105,111,66,111,120,34,32,110,97,109,
+101,61,34,114,98,79,110,68,101,108,101,116,101,34,62,10,32,32,32,32,32,
+32,32,32,32,32,32,32,60,108,97,98,101,108,62,79,110,32,68,101,108,101,116,
+101,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
+99,111,110,116,101,110,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,60,105,116,101,109,62,78,79,32,65,67,84,73,79,78,60,47,105,116,101,109,
+62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,82,
+69,83,84,82,73,67,84,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,60,105,116,101,109,62,67,65,83,67,65,68,69,60,47,105,
+116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,
+101,109,62,83,69,84,32,78,85,76,76,60,47,105,116,101,109,62,10,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,83,69,84,32,68,69,
+70,65,85,76,84,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,
+32,32,60,47,99,111,110,116,101,110,116,62,10,32,32,32,32,32,32,32,32,32,
+32,32,32,60,112,111,115,62,49,48,54,44,50,52,100,60,47,112,111,115,62,10,
+32,32,32,32,32,32,32,32,32,32,32,32,60,100,105,109,101,110,115,105,111,
+110,62,49,60,47,100,105,109,101,110,115,105,111,110,62,10,32,32,32,32,32,
+32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,82,65,95,83,80,69,
+67,73,70,89,95,67,79,76,83,60,47,115,116,121,108,101,62,10,32,32,32,32,
+32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,
+32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,60,47,111,98,106,
+101,99,116,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,
+32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,117,116,
+116,111,110,34,32,110,97,109,101,61,34,119,120,73,68,95,72,69,76,80,34,
+62,10,32,32,32,32,32,32,60,108,97,98,101,108,62,72,101,108,112,60,47,108,
+97,98,101,108,62,10,32,32,32,32,32,32,60,112,111,115,62,50,44,50,50,48,
100,60,47,112,111,115,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,
10,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
120,66,117,116,116,111,110,34,32,110,97,109,101,61,34,119,120,73,68,95,
-67,65,78,67,69,76,34,62,10,32,32,32,32,32,32,60,108,97,98,101,108,62,67,
-97,110,99,101,108,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,112,
-111,115,62,49,54,54,44,50,50,48,100,60,47,112,111,115,62,10,32,32,32,32,
-60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,115,105,122,101,62,50,
-49,56,44,50,51,56,100,60,47,115,105,122,101,62,10,32,32,32,32,60,115,116,
-121,108,101,47,62,10,32,32,60,47,111,98,106,101,99,116,62,10,60,47,114,
-101,115,111,117,114,99,101,62,10};
+79,75,34,62,10,32,32,32,32,32,32,60,108,97,98,101,108,62,79,75,60,47,108,
+97,98,101,108,62,10,32,32,32,32,32,32,60,100,101,102,97,117,108,116,62,
+49,60,47,100,101,102,97,117,108,116,62,10,32,32,32,32,32,32,60,112,111,
+115,62,49,49,51,44,50,50,48,100,60,47,112,111,115,62,10,32,32,32,32,60,
+47,111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,32,
+99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,
+101,61,34,119,120,73,68,95,67,65,78,67,69,76,34,62,10,32,32,32,32,32,32,
+60,108,97,98,101,108,62,67,97,110,99,101,108,60,47,108,97,98,101,108,62,
+10,32,32,32,32,32,32,60,112,111,115,62,49,54,54,44,50,50,48,100,60,47,112,
+111,115,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,
+60,115,105,122,101,62,50,49,56,44,50,51,56,100,60,47,115,105,122,101,62,
+10,32,32,32,32,60,115,116,121,108,101,47,62,10,32,32,60,47,111,98,106,101,
+99,116,62,10,60,47,114,101,115,111,117,114,99,101,62,10};
static size_t xml_res_size_10 = 14466;
static unsigned char xml_res_file_10[] = {
