Log Message:
-----------
remove tablespace for sequences
Tags:
----
REL-1_2_0_PATCHES
Modified Files:
--------------
pgadmin3/src/ui:
dlgSequence.cpp (r1.29.2.1 -> r1.29.2.2)
pgadmin3/src/ui/common:
dlgSequence.xrc (r1.11 -> r1.11.2.1)
xrcDialogs.cpp (r1.50 -> r1.50.2.1)
pgadmin3/src/schema:
pgSequence.cpp (r1.28.2.1 -> r1.28.2.2)
pgadmin3/src/include:
pgSequence.h (r1.17.2.1 -> r1.17.2.2)
Index: dlgSequence.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgSequence.cpp,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -Lsrc/ui/dlgSequence.cpp -Lsrc/ui/dlgSequence.cpp -u -w -r1.29.2.1
-r1.29.2.2
--- src/ui/dlgSequence.cpp
+++ src/ui/dlgSequence.cpp
@@ -26,7 +26,6 @@
#define txtIncrement CTRL_TEXT("txtIncrement")
#define cbOwner CTRL_COMBOBOX2("cbOwner")
-#define cbTablespace CTRL_COMBOBOX("cbTablespace")
#define txtMin CTRL_TEXT("txtMin")
#define txtMax CTRL_TEXT("txtMax")
#define txtStart CTRL_TEXT("txtStart")
@@ -37,8 +36,6 @@
// pointer to controls
BEGIN_EVENT_TABLE(dlgSequence, dlgSecurityProperty)
- EVT_TEXT(XRCID("cbTablespace"), dlgProperty::OnChange)
- EVT_COMBOBOX(XRCID("cbTablespace"), dlgProperty::OnChange)
EVT_TEXT(XRCID("txtStart"), dlgProperty::OnChange)
EVT_TEXT(XRCID("txtMin"), dlgProperty::OnChange)
EVT_TEXT(XRCID("txtMax"), dlgProperty::OnChange)
@@ -90,12 +87,10 @@
txtCache->Disable();
chkCycled->Disable();
}
- PrepareTablespace(cbTablespace, sequence->GetTablespace());
}
else
{
// create mode
- PrepareTablespace(cbTablespace);
txtIncrement->SetValidator(numericValidator);
txtMin->SetValidator(numericValidator);
txtMax->SetValidator(numericValidator);
@@ -131,8 +126,7 @@
|| txtMax->GetValue() != sequence->GetMaxValue().ToString()
|| txtCache->GetValue() != sequence->GetCacheValue().ToString()
|| txtIncrement->GetValue() !=
sequence->GetIncrement().ToString()
- || chkCycled->GetValue() != sequence->GetCycled()
- || cbTablespace->GetValue() != sequence->GetTablespace());
+ || chkCycled->GetValue() != sequence->GetCycled());
}
else
{
@@ -211,10 +205,6 @@
+ wxT("', ") + txtStart->GetValue()
+ wxT(", false);\n");
}
- if (cbTablespace->GetValue() != sequence->GetTablespace())
- sql += wxT("ALTER TABLE ") + schema->GetQuotedPrefix()+
qtIdent(name)
- + wxT(" SET TABLESPACE ") + qtIdent(cbTablespace->GetValue())
- + wxT(";\n");
}
else
{
@@ -227,7 +217,6 @@
AppendIfFilled(sql, wxT("\n MINVALUE "), txtMin->GetValue());
AppendIfFilled(sql, wxT("\n MAXVALUE "), txtMax->GetValue());
AppendIfFilled(sql, wxT("\n CACHE "), txtCache->GetValue());
- AppendIfFilled(sql, wxT("\n TABLESPACE "),
qtIdent(cbTablespace->GetValue()));
sql += wxT(";\n");
if (cbOwner->GetGuessedSelection() > 0)
Index: dlgSequence.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/dlgSequence.xrc,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -Lsrc/ui/common/dlgSequence.xrc -Lsrc/ui/common/dlgSequence.xrc -u -w
-r1.11 -r1.11.2.1
--- src/ui/common/dlgSequence.xrc
+++ src/ui/common/dlgSequence.xrc
@@ -32,72 +32,62 @@
<size>135,12d</size>
<style>wxCB_DROPDOWN</style>
</object>
- <object class="wxStaticText" name="stTablespace">
- <label>Tablespace</label>
- <pos>5,52d</pos>
- </object>
- <object class="wxComboBox" name="cbTablespace">
- <content/>
- <pos>70,50d</pos>
- <size>135,12d</size>
- <style>wxCB_READONLY|wxCB_DROPDOWN</style>
- </object>
<object class="wxStaticText" name="stIncrement">
<label>Increment</label>
- <pos>5,67d</pos>
+ <pos>5,52d</pos>
</object>
<object class="wxTextCtrl" name="txtIncrement">
- <pos>70,65d</pos>
+ <pos>70,50d</pos>
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stStart">
<label>Start</label>
- <pos>5,82d</pos>
+ <pos>5,67d</pos>
</object>
<object class="wxTextCtrl" name="txtStart">
- <pos>70,80d</pos>
+ <pos>70,65d</pos>
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stMin">
<label>Minimum</label>
- <pos>5,97d</pos>
+ <pos>5,82d</pos>
</object>
<object class="wxTextCtrl" name="txtMin">
- <pos>70,95d</pos>
+ <pos>70,80d</pos>
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stMax">
<label>Maximum</label>
- <pos>5,112d</pos>
+ <pos>5,97d</pos>
</object>
<object class="wxTextCtrl" name="txtMax">
- <pos>70,110d</pos>
+ <pos>70,95d</pos>
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stCache">
<label>Cache</label>
- <pos>5,127d</pos>
+ <pos>5,112d</pos>
</object>
<object class="wxTextCtrl" name="txtCache">
- <pos>70,125d</pos>
+ <pos>70,110d</pos>
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stCycled">
<label>Cycled</label>
- <pos>5,142d</pos>
+ <pos>5,127d</pos>
</object>
<object class="wxCheckBox" name="chkCycled">
<label></label>
- <pos>70,140d</pos>
+ <pos>70,125d</pos>
<size>13,12d</size>
</object>
<object class="wxStaticText" name="stComment">
<label>Comment</label>
- <pos>5,157d</pos>
+ <pos>5,142d</pos>
</object>
<object class="wxTextCtrl" name="txtComment">
- <pos>70,155d</pos>
- <size>135,102d</size>
+ <pos>70,140d</pos>
+ <size>135,117d</size>
<style>wxTE_MULTILINE</style>
</object>
</object>
Index: xrcDialogs.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/xrcDialogs.cpp,v
retrieving revision 1.50
retrieving revision 1.50.2.1
diff -Lsrc/ui/common/xrcDialogs.cpp -Lsrc/ui/common/xrcDialogs.cpp -u -w -r1.50
-r1.50.2.1
--- src/ui/common/xrcDialogs.cpp
+++ src/ui/common/xrcDialogs.cpp
@@ -4618,7 +4618,7 @@
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_21 = 4087;
+static size_t xml_res_size_21 = 3719;
static unsigned char xml_res_file_21[] = {
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,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -4675,140 +4675,123 @@
95,68,82,79,80,68,79,87,78,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,83,
-116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,84,
-97,98,108,101,115,112,97,99,101,34,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,60,108,97,98,101,108,62,84,97,98,108,101,115,112,97,99,101,60,47,
-108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
-115,62,53,44,53,50,100,60,47,112,111,115,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,67,111,109,98,
-111,66,111,120,34,32,110,97,109,101,61,34,99,98,84,97,98,108,101,115,112,
-97,99,101,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,110,116,
-101,110,116,47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
+116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,73,
+110,99,114,101,109,101,110,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,
+32,60,108,97,98,101,108,62,73,110,99,114,101,109,101,110,116,60,47,108,
+97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
+62,53,44,53,50,100,60,47,112,111,115,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,84,101,120,116,67,
+116,114,108,34,32,110,97,109,101,61,34,116,120,116,73,110,99,114,101,109,
+101,110,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
62,55,48,44,53,48,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,
-32,32,32,60,115,105,122,101,62,49,51,53,44,49,50,100,60,47,115,105,122,
-101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,
-119,120,67,66,95,82,69,65,68,79,78,76,89,124,119,120,67,66,95,68,82,79,
-80,68,79,87,78,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,83,116,97,116,
-105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,73,110,99,114,
-101,109,101,110,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,
-97,98,101,108,62,73,110,99,114,101,109,101,110,116,60,47,108,97,98,101,
+32,32,32,60,115,105,122,101,62,49,51,53,44,45,49,100,60,47,115,105,122,
+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,83,116,97,116,105,99,84,101,120,116,34,32,110,97,
+109,101,61,34,115,116,83,116,97,114,116,34,62,10,32,32,32,32,32,32,32,32,
+32,32,32,32,60,108,97,98,101,108,62,83,116,97,114,116,60,47,108,97,98,101,
108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,54,
55,100,60,47,112,111,115,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,84,101,120,116,67,116,114,108,
-34,32,110,97,109,101,61,34,116,120,116,73,110,99,114,101,109,101,110,116,
-34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,
-54,53,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
-115,105,122,101,62,49,51,53,44,45,49,100,60,47,115,105,122,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,83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,
-116,83,116,97,114,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,
-97,98,101,108,62,83,116,97,114,116,60,47,108,97,98,101,108,62,10,32,32,
-32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,56,50,100,60,47,112,
-111,115,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,84,101,120,116,67,116,114,108,34,32,110,97,109,
-101,61,34,116,120,116,83,116,97,114,116,34,62,10,32,32,32,32,32,32,32,32,
-32,32,32,32,60,112,111,115,62,55,48,44,56,48,100,60,47,112,111,115,62,10,
-32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,45,
-49,100,60,47,115,105,122,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,83,116,97,116,105,99,84,101,
-120,116,34,32,110,97,109,101,61,34,115,116,77,105,110,34,62,10,32,32,32,
-32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,77,105,110,105,109,117,
-109,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
-112,111,115,62,53,44,57,55,100,60,47,112,111,115,62,10,32,32,32,32,32,32,
+34,32,110,97,109,101,61,34,116,120,116,83,116,97,114,116,34,62,10,32,32,
+32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,54,53,100,60,47,
+112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,
+62,49,51,53,44,45,49,100,60,47,115,105,122,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,84,101,120,
-116,67,116,114,108,34,32,110,97,109,101,61,34,116,120,116,77,105,110,34,
-62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,57,
-53,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,
-105,122,101,62,49,51,53,44,45,49,100,60,47,115,105,122,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,83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,
-116,77,97,120,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,
-101,108,62,77,97,120,105,109,117,109,60,47,108,97,98,101,108,62,10,32,32,
-32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,49,49,50,100,60,47,
-112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,
+32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,83,116,97,
+116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,77,105,110,
+34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,77,
+105,110,105,109,117,109,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,
+32,32,32,32,32,32,60,112,111,115,62,53,44,56,50,100,60,47,112,111,115,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,84,101,120,116,67,116,114,108,34,32,110,97,109,101,61,34,116,
+120,116,77,105,110,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,
+111,115,62,55,48,44,56,48,100,60,47,112,111,115,62,10,32,32,32,32,32,32,
+32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,45,49,100,60,47,115,
+105,122,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,84,101,120,116,67,116,114,108,34,32,110,97,
-109,101,61,34,116,120,116,77,97,120,34,62,10,32,32,32,32,32,32,32,32,32,
-32,32,32,60,112,111,115,62,55,48,44,49,49,48,100,60,47,112,111,115,62,10,
-32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,45,
-49,100,60,47,115,105,122,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,83,116,97,116,105,99,84,101,
-120,116,34,32,110,97,109,101,61,34,115,116,67,97,99,104,101,34,62,10,32,
-32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,67,97,99,104,101,
-60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,
-111,115,62,53,44,49,50,55,100,60,47,112,111,115,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,84,101,120,
-116,67,116,114,108,34,32,110,97,109,101,61,34,116,120,116,67,97,99,104,
-101,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,55,48,
-44,49,50,53,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,
-32,60,115,105,122,101,62,49,51,53,44,45,49,100,60,47,115,105,122,101,62,
+108,97,115,115,61,34,119,120,83,116,97,116,105,99,84,101,120,116,34,32,
+110,97,109,101,61,34,115,116,77,97,120,34,62,10,32,32,32,32,32,32,32,32,
+32,32,32,32,60,108,97,98,101,108,62,77,97,120,105,109,117,109,60,47,108,
+97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
+62,53,44,57,55,100,60,47,112,111,115,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,84,101,120,116,67,
+116,114,108,34,32,110,97,109,101,61,34,116,120,116,77,97,120,34,62,10,32,
+32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,57,53,100,60,
+47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,
+101,62,49,51,53,44,45,49,100,60,47,115,105,122,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,83,116,
+97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,67,97,99,
+104,101,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,
+62,67,97,99,104,101,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,
+32,32,32,32,32,60,112,111,115,62,53,44,49,49,50,100,60,47,112,111,115,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,83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,
-34,115,116,67,121,99,108,101,100,34,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,60,108,97,98,101,108,62,67,121,99,108,101,100,60,47,108,97,98,101,
+34,119,120,84,101,120,116,67,116,114,108,34,32,110,97,109,101,61,34,116,
+120,116,67,97,99,104,101,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
+112,111,115,62,55,48,44,49,49,48,100,60,47,112,111,115,62,10,32,32,32,32,
+32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,45,49,100,60,
+47,115,105,122,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,83,116,97,116,105,99,84,101,120,116,
+34,32,110,97,109,101,61,34,115,116,67,121,99,108,101,100,34,62,10,32,32,
+32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,67,121,99,108,101,
+100,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
+112,111,115,62,53,44,49,50,55,100,60,47,112,111,115,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,67,104,
+101,99,107,66,111,120,34,32,110,97,109,101,61,34,99,104,107,67,121,99,108,
+101,100,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,
+47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,
+49,50,53,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,
+60,115,105,122,101,62,49,51,44,49,50,100,60,47,115,105,122,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,83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,
+116,67,111,109,109,101,110,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,
+32,60,108,97,98,101,108,62,67,111,109,109,101,110,116,60,47,108,97,98,101,
108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,49,
52,50,100,60,47,112,111,115,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,67,104,101,99,107,66,111,120,
-34,32,110,97,109,101,61,34,99,104,107,67,121,99,108,101,100,34,62,10,32,
-32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,47,62,10,32,32,32,
-32,32,32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,49,52,48,100,60,47,
-112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,
-62,49,51,44,49,50,100,60,47,115,105,122,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,83,116,97,116,
-105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,67,111,109,109,
-101,110,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,
-108,62,67,111,109,109,101,110,116,60,47,108,97,98,101,108,62,10,32,32,32,
-32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,49,53,55,100,60,47,112,
-111,115,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,84,101,120,116,67,116,114,108,34,32,110,97,109,
-101,61,34,116,120,116,67,111,109,109,101,110,116,34,62,10,32,32,32,32,32,
-32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,49,53,53,100,60,47,112,
-111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,
-49,51,53,44,49,48,50,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,
-32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,84,69,95,77,85,76,84,
-73,76,73,78,69,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,32,32,60,115,101,108,101,99,116,
-101,100,62,49,60,47,115,101,108,101,99,116,101,100,62,10,32,32,32,32,32,
-32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,60,112,111,115,62,
-50,44,50,100,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105,122,101,
-62,50,49,52,44,50,55,54,100,60,47,115,105,122,101,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,56,51,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,56,51,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,56,51,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,51,
-48,49,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};
+99,116,32,99,108,97,115,115,61,34,119,120,84,101,120,116,67,116,114,108,
+34,32,110,97,109,101,61,34,116,120,116,67,111,109,109,101,110,116,34,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,49,52,
+48,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,
+105,122,101,62,49,51,53,44,49,49,55,100,60,47,115,105,122,101,62,10,32,
+32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,84,69,
+95,77,85,76,84,73,76,73,78,69,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,32,32,60,115,
+101,108,101,99,116,101,100,62,49,60,47,115,101,108,101,99,116,101,100,62,
+10,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,
+60,112,111,115,62,50,44,50,100,60,47,112,111,115,62,10,32,32,32,32,32,32,
+60,115,105,122,101,62,50,49,52,44,50,55,54,100,60,47,115,105,122,101,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,56,51,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,56,51,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,56,51,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,51,48,49,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_22 = 3595;
static unsigned char xml_res_file_22[] = {
Index: pgSequence.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgSequence.cpp,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -Lsrc/schema/pgSequence.cpp -Lsrc/schema/pgSequence.cpp -u -w -r1.28.2.1
-r1.28.2.2
--- src/schema/pgSequence.cpp
+++ src/schema/pgSequence.cpp
@@ -69,7 +69,7 @@
+ wxT("\n CACHE ") + GetCacheValue().ToString();
if (GetCycled())
sql += wxT("\n CYCLE");
- AppendIfFilled(sql, wxT("\n TABLESPACE "), qtIdent(tablespace));
+
sql += wxT(";\n")
+ GetOwnerSql(7, 3, wxT("TABLE ") + GetQuotedFullIdentifier())
+ GetGrant(wxT("arwdRxt"), wxT("TABLE ") +
GetQuotedFullIdentifier())
@@ -89,8 +89,6 @@
properties->AppendItem(_("Name"), GetName());
properties->AppendItem(_("OID"), GetOid());
properties->AppendItem(_("Owner"), GetOwner());
- if (!tablespace.IsEmpty())
- properties->AppendItem(_("Tablespace"), tablespace);
properties->AppendItem(_("ACL"), GetAcl());
properties->AppendItem(_("Current value"), GetLastValue());
properties->AppendItem(_("Minimum"), GetMinValue());
@@ -147,19 +145,6 @@
pgSequence *sequence=0;
pgSet *sequences;
- if (collection->GetConnection()->BackendMinimumVersion(7, 5))
- {
- sequences = collection->GetDatabase()->ExecuteSet(
- wxT("SELECT cl.oid, relname, spcname, pg_get_userbyid(relowner) AS
seqowner, relacl, description\n")
- wxT(" FROM pg_class cl\n")
- wxT(" LEFT OUTER JOIN pg_tablespace ta on
ta.oid=cl.reltablespace\n")
- wxT(" LEFT OUTER JOIN pg_description des ON des.objoid=cl.oid\n")
- wxT(" WHERE relkind = 'S' AND relnamespace = ") +
collection->GetSchema()->GetOidStr()
- + restriction + wxT("\n")
- wxT(" ORDER BY relname"));
- }
- else
- {
sequences = collection->GetDatabase()->ExecuteSet(
wxT("SELECT cl.oid, relname, pg_get_userbyid(relowner) AS
seqowner, relacl, description\n")
wxT(" FROM pg_class cl\n")
@@ -167,7 +152,7 @@
wxT(" WHERE relkind = 'S' AND relnamespace = ") +
collection->GetSchema()->GetOidStr()
+ restriction + wxT("\n")
wxT(" ORDER BY relname"));
- }
+
if (sequences)
{
while (!sequences->Eof())
@@ -179,8 +164,6 @@
sequence->iSetComment(sequences->GetVal(wxT("description")));
sequence->iSetOwner(sequences->GetVal(wxT("seqowner")));
sequence->iSetAcl(sequences->GetVal(wxT("relacl")));
- if (collection->GetConnection()->BackendMinimumVersion(7, 5))
- sequence->iSetTablespace(sequences->GetVal(wxT("spcname")));
if (browser)
{
Index: pgSequence.h
===================================================================
RCS file: /projects/pgadmin3/src/include/pgSequence.h,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -Lsrc/include/pgSequence.h -Lsrc/include/pgSequence.h -u -w -r1.17.2.1
-r1.17.2.2
--- src/include/pgSequence.h
+++ src/include/pgSequence.h
@@ -34,8 +34,6 @@
void ShowStatistics(frmMain *form, ctlListView *statistics);
static pgObject *ReadObjects(pgCollection *collection, wxTreeCtrl
*browser, const wxString &restriction=wxT(""));
- wxString GetTablespace() const { return tablespace; };
- void iSetTablespace(const wxString& newVal) { tablespace = newVal; }
void UpdateValues();
wxULongLong GetLastValue() const { return lastValue; }
wxULongLong GetMinValue() const { return minValue; }
@@ -51,7 +49,6 @@
private:
wxULongLong lastValue, minValue, maxValue, cacheValue, increment;
bool cycled;
- wxString tablespace;
};
#endif
---------------------------(end of broadcast)---------------------------
TIP 8: explain analyze is your friend
