Author: andreas
Date: 2005-10-08 21:48:59 +0100 (Sat, 08 Oct 2005)
New Revision: 4523
Added:
trunk/pgadmin3/src/include/images/sequence-repl.xpm
trunk/pgadmin3/src/include/images/table-repl-sm.xpm
trunk/pgadmin3/src/include/images/table-repl.xpm
Modified:
trunk/pgadmin3/CHANGELOG.txt
trunk/pgadmin3/TODO.txt
trunk/pgadmin3/src/include/images/table-sm.xpm
trunk/pgadmin3/src/include/images/table.xpm
trunk/pgadmin3/src/include/images/tables.xpm
trunk/pgadmin3/src/include/pgSequence.h
trunk/pgadmin3/src/include/pgTable.h
trunk/pgadmin3/src/main/events.cpp
trunk/pgadmin3/src/schema/pgSequence.cpp
trunk/pgadmin3/src/schema/pgTable.cpp
trunk/pgadmin3/src/slony/include/slCluster.h
trunk/pgadmin3/src/slony/include/slSet.h
trunk/pgadmin3/src/slony/slSequence.cpp
trunk/pgadmin3/src/slony/slTable.cpp
Log:
Fix "New" context menu crash on disconnected server
improved replicated object visualization
Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt 2005-10-08 16:52:18 UTC (rev 4522)
+++ trunk/pgadmin3/CHANGELOG.txt 2005-10-08 20:48:59 UTC (rev 4523)
@@ -17,8 +17,9 @@
</ul>
<br>
<ul>
- <li>2005-10-08 AP Check for catalog access privilege in pg_authid
and pg_depend
- <li>2005-10-04 AP -t cmd line option to enable language debugging
+ <li>2005-10-08 AP 1.4B2 Fix "New" context menu crash on disconnected
server (r: Tomasz Rybak)
+ <li>2005-10-08 AP 1.4B2 Check for catalog access privilege in pg_authid
and pg_depend (r: Christopher St.John)
+ <li>2005-10-04 AP 1.4B1 -t cmd line option to enable language debugging
<li>2005-10-03 AP pg_autovacuum support
<li>2005-10-03 AP upgrade slony node
<li>2005-09-17 AP Allow Query Tool to use multiple connections
Modified: trunk/pgadmin3/TODO.txt
===================================================================
--- trunk/pgadmin3/TODO.txt 2005-10-08 16:52:18 UTC (rev 4522)
+++ trunk/pgadmin3/TODO.txt 2005-10-08 20:48:59 UTC (rev 4523)
@@ -16,6 +16,7 @@
<li>Enhancements / wishes
<ul>
<li>Slony-I failover
+ <li>detection of tables and sequences that are replicated
(tables on slave, sequences master+slave)
<li>extract partially or whole schema/db and edit it with Query
Tool
<li>Guru hint for long query retrieval durations
<li>Track connection usage by property dialogs to prevent
closing used connections
Added: trunk/pgadmin3/src/include/images/sequence-repl.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/sequence-repl.xpm 2005-10-08 16:52:18 UTC
(rev 4522)
+++ trunk/pgadmin3/src/include/images/sequence-repl.xpm 2005-10-08 20:48:59 UTC
(rev 4523)
@@ -0,0 +1,98 @@
+/* XPM */
+static char * sequence_repl_xpm[] = {
+"16 16 79 1",
+" c None",
+". c #B7A7DC",
+"+ c #8469C4",
+"@ c #CAC6E2",
+"# c #DFDFEF",
+"$ c #E1DFED",
+"% c #E2DEEE",
+"& c #FBFDFB",
+"* c #FCFCFC",
+"= c #FAFCFC",
+"- c #FDFBFF",
+"; c #FCFCFE",
+"> c #FFFBFF",
+", c #EEEAF8",
+"' c #F0EAFA",
+") c #F0EAF8",
+"! c #DAD0F0",
+"~ c #DACEF0",
+"{ c #C1B1E6",
+"] c #C2B2E5",
+"^ c #9CB255",
+"/ c #B6DE79",
+"( c #94A166",
+"_ c #8770BC",
+": c #AB98D9",
+"< c #A798CE",
+"[ c #AD9AD3",
+"} c #AB97DE",
+"| c #AD97DE",
+"1 c #9CB355",
+"2 c #AAD36A",
+"3 c #B0DD77",
+"4 c #8CA83A",
+"5 c #A2B06F",
+"6 c #92BF4F",
+"7 c #87A031",
+"8 c #9E88D7",
+"9 c #4882BE",
+"0 c #7892CB",
+"a c #5F8981",
+"b c #86B268",
+"c c #9BCE61",
+"d c #8DBC4A",
+"e c #8FC856",
+"f c #7E9922",
+"g c #73C6DF",
+"h c #71C4DE",
+"i c #6EC1DD",
+"j c #63AED3",
+"k c #62917E",
+"l c #8DC251",
+"m c #89C450",
+"n c #82BF49",
+"o c #70C3DE",
+"p c #6EC0DD",
+"q c #5DA5CF",
+"r c #5A8987",
+"s c #88C251",
+"t c #83BD48",
+"u c #7DBA43",
+"v c #78B73E",
+"w c #6DBFDC",
+"x c #5191C5",
+"y c #5DA6D0",
+"z c #5BA5D0",
+"A c #607DAA",
+"B c #AFACB9",
+"C c #8273A1",
+"D c #AAA3B3",
+"E c #6F9CCC",
+"F c #639DCC",
+"G c #8FB2D7",
+"H c #649BCB",
+"I c #5EACD4",
+"J c #5296C8",
+"K c #617AC1",
+"L c #6092C6",
+"M c #5899CA",
+"N c #87ADD4",
+" .+. ",
+" [EMAIL PROTECTED] ",
+" .+#$%+. ",
+" +&&*==+. ",
+" .+--;>-+. ",
+" .+,',,)+. ",
+" .+!~!!!+. ",
+" .+{{]{{+. ",
+" ^/(_:<[}|+. ",
+" 12345678+. ",
+"9990abcdef+. ",
+"9ghijklmnf. ",
+"9opqrstuvf ",
+"9wxyzABCD ",
+"EFGHIJK. ",
+" LMN "};
Added: trunk/pgadmin3/src/include/images/table-repl-sm.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/table-repl-sm.xpm 2005-10-08 16:52:18 UTC
(rev 4522)
+++ trunk/pgadmin3/src/include/images/table-repl-sm.xpm 2005-10-08 20:48:59 UTC
(rev 4523)
@@ -0,0 +1,121 @@
+/* XPM */
+static char * table_repl_sm_xpm[] = {
+"16 16 102 2",
+" c None",
+". c #2195E7",
+"+ c #8ACEFE",
+"@ c #94CFF9",
+"# c #ADD5F2",
+"$ c #CADCEA",
+"% c #DEE3E7",
+"& c #E6E7E7",
+"* c #E6E6E6",
+"= c #C5D8E6",
+"- c #76B9E8",
+"; c #309CE8",
+"> c #88CDFE",
+", c #83CBFE",
+"' c #7AC6FB",
+") c #6FC0F9",
+"! c #63B9F6",
+"~ c #56B2F3",
+"{ c #49ABF0",
+"] c #3DA5ED",
+"^ c #319EEB",
+"/ c #2799E9",
+"( c #83CBFD",
+"_ c #4AABF0",
+": c #3DA4ED",
+"< c #2899E9",
+"[ c #B3D5ED",
+"} c #DDDDDD",
+"| c #DEDEDE",
+"1 c #DFDFDF",
+"2 c #E2E2E2",
+"3 c #E3E3E3",
+"4 c #E5E5E5",
+"5 c #87C0E7",
+"6 c #92AA43",
+"7 c #B0D66F",
+"8 c #C8D1AE",
+"9 c #E3E3DF",
+"0 c #A7A9A3",
+"a c #D9DBD3",
+"b c #ACACAC",
+"c c #ECECEC",
+"d c #EEEEEE",
+"e c #E9E9E9",
+"f c #94AE47",
+"g c #B0DB74",
+"h c #AAD76E",
+"i c #95A94C",
+"j c #8BA33A",
+"k c #8FB546",
+"l c #ADADAD",
+"m c #AFAFAF",
+"n c #EAEAEA",
+"o c #4882BE",
+"p c #378ACF",
+"q c #66937A",
+"r c #8DB754",
+"s c #97C95A",
+"t c #92C958",
+"u c #87B23E",
+"v c #E7E7E7",
+"w c #EBEBEB",
+"x c #73C6DF",
+"y c #71C4DE",
+"z c #6EC0DD",
+"A c #5DA3C9",
+"B c #779F4C",
+"C c #8DC755",
+"D c #86C14D",
+"E c #7FAD37",
+"F c #EFEFEF",
+"G c #F1F1F1",
+"H c #EDEDED",
+"I c #70C3DE",
+"J c #6DBFDC",
+"K c #5497C8",
+"L c #679777",
+"M c #87C04E",
+"N c #81BC46",
+"O c #7BB841",
+"P c #7AA931",
+"Q c #B0B0B0",
+"R c #B2B2B2",
+"S c #6CBEDC",
+"T c #5293C6",
+"U c #579CCB",
+"V c #59A0CA",
+"W c #AFC0B6",
+"X c #CDD3BA",
+"Y c #CED4BA",
+"Z c #CFD5BB",
+"` c #F0F0F0",
+" . c #6F9CCC",
+".. c #659DCC",
+"+. c #8BAFD6",
+"@. c #5D9ACA",
+"#. c #5DA9D2",
+"$. c #5296C8",
+"%. c #69AEE5",
+"&. c #6FC0F8",
+"*. c #2899E8",
+"=. c #5A92C6",
+" ",
+" ",
+" . . . . . . . . . . . . ",
+" . + @ # $ % & * * = - ; ",
+" . > , ' ) ! ~ { ] ^ / . ",
+" . > ( ' ) ! ~ _ : ^ < . ",
+" . [ } } | 1 2 3 4 * 5 . ",
+" 6 7 8 9 0 a 3 b c d e . ",
+" f g h i j k 4 b l m n . ",
+"o o o p q r s t u * v e n w . ",
+"o x y z A B C D E v m F G H . ",
+"o I J K L M N O P e m Q R d . ",
+"o S T U V W X Y Z w c H d ` . ",
+" [EMAIL PROTECTED]&.! ~ _ : ^ *.. ",
+" =.=. ",
+" "};
Added: trunk/pgadmin3/src/include/images/table-repl.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/table-repl.xpm 2005-10-08 16:52:18 UTC
(rev 4522)
+++ trunk/pgadmin3/src/include/images/table-repl.xpm 2005-10-08 20:48:59 UTC
(rev 4523)
@@ -0,0 +1,158 @@
+/* XPM */
+static char * table_repl_xpm[] = {
+"16 16 139 2",
+" c None",
+". c #2195E7",
+"+ c #8DD0FF",
+"@ c #92CFFB",
+"# c #A2D3F5",
+"$ c #BAD8ED",
+"% c #D1DFE9",
+"& c #DFE3E7",
+"* c #E5E6E7",
+"= c #E6E6E6",
+"- c #DAE1E5",
+"; c #ACCEE7",
+"> c #63B1E8",
+", c #2E9BE8",
+"' c #8BCFFF",
+") c #85CCFE",
+"! c #7EC8FC",
+"~ c #75C3FA",
+"{ c #6CBEF8",
+"] c #61B8F6",
+"^ c #56B2F3",
+"/ c #4BACF0",
+"( c #40A7EE",
+"_ c #37A0EC",
+": c #2D9CEA",
+"< c #2698E9",
+"[ c #85CCFD",
+"} c #6BBEF8",
+"| c #41A6EE",
+"1 c #36A1EC",
+"2 c #2E9CEA",
+"3 c #B4D6EE",
+"4 c #DDDDDD",
+"5 c #DEDEDE",
+"6 c #DFDFDF",
+"7 c #E0E0E0",
+"8 c #E1E1E1",
+"9 c #E2E2E2",
+"0 c #E3E3E3",
+"a c #E5E5E5",
+"b c #87BFE7",
+"c c #E8E8E8",
+"d c #E9E9E9",
+"e c #B2C17F",
+"f c #9DBD53",
+"g c #8DA93A",
+"h c #A9A9A9",
+"i c #E4E4E4",
+"j c #ACACAC",
+"k c #ECECEC",
+"l c #EDEDED",
+"m c #EFEFEF",
+"n c #EAEAEA",
+"o c #90A941",
+"p c #9FC256",
+"q c #B2DC76",
+"r c #91AF43",
+"s c #A7B382",
+"t c #A6B868",
+"u c #8EAD42",
+"v c #A3B662",
+"w c #ADADAD",
+"x c #AFAFAF",
+"y c #EBEBEB",
+"z c #D0D5BF",
+"A c #AABD77",
+"B c #A9D66E",
+"C c #8EB240",
+"D c #92B247",
+"E c #90BD4C",
+"F c #8EBD4B",
+"G c #7E9922",
+"H c #4882BE",
+"I c #4D8AC1",
+"J c #4C89C1",
+"K c #58898F",
+"L c #9BCD60",
+"M c #96CD5E",
+"N c #8FC856",
+"O c #86B743",
+"P c #F0F0F0",
+"Q c #F2F2F2",
+"R c #EEEEEE",
+"S c #73C6DF",
+"T c #71C4DE",
+"U c #6EC1DD",
+"V c #64B0D4",
+"W c #548AA4",
+"X c #88B542",
+"Y c #8AC552",
+"Z c #84C04B",
+"` c #7FB23C",
+" . c #B1B1B1",
+".. c #B2B2B2",
+"+. c #70C4DE",
+"@. c #6EC0DD",
+"#. c #68B8D9",
+"$. c #5287A3",
+"%. c #81B85D",
+"&. c #86C14D",
+"*. c #81BE48",
+"=. c #7BBA42",
+"-. c #79AF36",
+";. c #F1F1F1",
+">. c #F3F3F3",
+",. c #F5F5F5",
+"'. c #63AED4",
+"). c #67B7D9",
+"!. c #579DCB",
+"~. c #55899D",
+"{. c #A5B76A",
+"]. c #8FA154",
+"^. c #A4B76A",
+"/. c #90A255",
+"(. c #F6F6F6",
+"_. c #F8F8F8",
+":. c #61ACD3",
+"<. c #74A2CF",
+"[. c #5091C5",
+"}. c #5EABD3",
+"|. c #5AA5D0",
+"1. c #7094B9",
+"2. c #B5B5B5",
+"3. c #B6B6B6",
+"4. c #B8B8B8",
+"5. c #F7F7F7",
+"6. c #93B5D9",
+"7. c #6394C7",
+"8. c #399BE3",
+"9. c #9AB9D9",
+"0. c #5797C9",
+"a. c #4E8DC4",
+"b. c #579DCC",
+"c. c #ABC3DB",
+"d. c #2596E6",
+"e. c #60A0D7",
+"f. c #5694C7",
+"g. c #6C9FD0",
+"h. c #359AE4",
+" . . . . . . . . . . . . . . ",
+" . + @ # $ % & * = = - ; > , ",
+" . ' ) ! ~ { ] ^ / ( _ : < . ",
+" . ' [ ! ~ } ] ^ / | 1 2 < . ",
+" . 3 4 4 5 6 7 8 9 0 a = b . ",
+" . 4 4 5 6 7 8 9 0 a = c d . ",
+" . e f g c h 9 i j k l m n . ",
+" . o p q r s t u v w x x y . ",
+" . z A B C D E F G d n k l . ",
+"H I J J J K L M N O G m P Q R . ",
+"H S T U V W X Y Z ` G .....P . ",
+"H [EMAIL PROTECTED]&.*.=.-.G ;.Q >.,.. ",
+"H @.'.).!.~.{.].^.{./.,.(._.(.. ",
+"H :.<.[.}.|.1...P ;.2.3.4.4.5.. ",
+"6.7.8.9.0.a.b.c.;.Q >.,.(.5.5.. ",
+" . d.e.f.g.h.. . . . . . . . "};
Modified: trunk/pgadmin3/src/include/images/table-sm.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/table-sm.xpm 2005-10-08 16:52:18 UTC
(rev 4522)
+++ trunk/pgadmin3/src/include/images/table-sm.xpm 2005-10-08 20:48:59 UTC
(rev 4523)
@@ -64,7 +64,7 @@
"v c #2899E8",
" ",
" ",
-" .......... ",
+" ............ ",
" [EMAIL PROTECTED]&**=-; ",
" .>,')!~{]^/. ",
" .>(')!~_:^<. ",
@@ -75,6 +75,6 @@
" .1jak3hflmn. ",
" .7kko4afpq0. ",
" .d2r4*i9n0s. ",
-" >,tu!~_:^v ",
+" .>,tu!~_:^v. ",
" ",
" "};
Modified: trunk/pgadmin3/src/include/images/table.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/table.xpm 2005-10-08 16:52:18 UTC (rev
4522)
+++ trunk/pgadmin3/src/include/images/table.xpm 2005-10-08 20:48:59 UTC (rev
4523)
@@ -1,92 +1,91 @@
/* XPM */
static char * table_xpm[] = {
-"16 16 73 1",
+"16 16 72 1",
" c None",
". c #2195E7",
-"+ c #90CAF3",
-"@ c #8DD0FF",
-"# c #92CFFB",
-"$ c #A2D3F5",
-"% c #BAD8ED",
-"& c #D1DFE9",
-"* c #DFE3E7",
-"= c #E5E6E7",
-"- c #E6E6E6",
-"; c #DAE1E5",
-"> c #ACCEE7",
-", c #63B1E8",
-"' c #2E9BE8",
-") c #8BCFFF",
-"! c #85CCFE",
-"~ c #7EC8FC",
-"{ c #75C3FA",
-"] c #6CBEF8",
-"^ c #61B8F6",
-"/ c #56B2F3",
-"( c #4BACF0",
-"_ c #40A7EE",
-": c #37A0EC",
-"< c #2D9CEA",
-"[ c #2698E9",
-"} c #85CCFD",
-"| c #6BBEF8",
-"1 c #41A6EE",
-"2 c #36A1EC",
-"3 c #2E9CEA",
-"4 c #B4D6EE",
-"5 c #DDDDDD",
-"6 c #DEDEDE",
-"7 c #DFDFDF",
-"8 c #E0E0E0",
-"9 c #E1E1E1",
-"0 c #E2E2E2",
-"a c #E3E3E3",
-"b c #E5E5E5",
-"c c #87BFE7",
-"d c #E8E8E8",
-"e c #E9E9E9",
-"f c #E7E7E7",
-"g c #A9A9A9",
-"h c #E4E4E4",
-"i c #ACACAC",
-"j c #ECECEC",
-"k c #EDEDED",
-"l c #EFEFEF",
-"m c #EAEAEA",
-"n c #A7A7A7",
-"o c #A8A8A8",
-"p c #ADADAD",
-"q c #AFAFAF",
-"r c #EBEBEB",
-"s c #F0F0F0",
-"t c #F2F2F2",
-"u c #EEEEEE",
-"v c #ABABAB",
-"w c #B0B0B0",
-"x c #B1B1B1",
-"y c #B2B2B2",
-"z c #F1F1F1",
-"A c #F3F3F3",
-"B c #F5F5F5",
-"C c #B5B5B5",
-"D c #F6F6F6",
-"E c #F8F8F8",
-"F c #B6B6B6",
-"G c #B8B8B8",
-"H c #F7F7F7",
-" ............+ ",
-" [EMAIL PROTECTED]&*=--;>,' ",
-" .)!~{]^/(_:<[. ",
-" .)}~{|^/(123[. ",
-" .45567890ab-c. ",
-" .5567890ab-de. ",
-" .5-fdg0hijklm. ",
-" .6noggabipqqr. ",
-" .7890ab-femjk. ",
-" .8eemi-fqlstu. ",
-" .9gviidewxyys. ",
-" .-ferjkusztAB. ",
-" .flssyusCBDED. ",
-" .ewxyyszCFGGH. ",
-" .rjkusztABDHH. ",
-" +............+ "};
+"+ c #8DD0FF",
+"@ c #92CFFB",
+"# c #A2D3F5",
+"$ c #BAD8ED",
+"% c #D1DFE9",
+"& c #DFE3E7",
+"* c #E5E6E7",
+"= c #E6E6E6",
+"- c #DAE1E5",
+"; c #ACCEE7",
+"> c #63B1E8",
+", c #2E9BE8",
+"' c #8BCFFF",
+") c #85CCFE",
+"! c #7EC8FC",
+"~ c #75C3FA",
+"{ c #6CBEF8",
+"] c #61B8F6",
+"^ c #56B2F3",
+"/ c #4BACF0",
+"( c #40A7EE",
+"_ c #37A0EC",
+": c #2D9CEA",
+"< c #2698E9",
+"[ c #85CCFD",
+"} c #6BBEF8",
+"| c #41A6EE",
+"1 c #36A1EC",
+"2 c #2E9CEA",
+"3 c #B4D6EE",
+"4 c #DDDDDD",
+"5 c #DEDEDE",
+"6 c #DFDFDF",
+"7 c #E0E0E0",
+"8 c #E1E1E1",
+"9 c #E2E2E2",
+"0 c #E3E3E3",
+"a c #E5E5E5",
+"b c #87BFE7",
+"c c #E8E8E8",
+"d c #E9E9E9",
+"e c #E7E7E7",
+"f c #A9A9A9",
+"g c #E4E4E4",
+"h c #ACACAC",
+"i c #ECECEC",
+"j c #EDEDED",
+"k c #EFEFEF",
+"l c #EAEAEA",
+"m c #A7A7A7",
+"n c #A8A8A8",
+"o c #ADADAD",
+"p c #AFAFAF",
+"q c #EBEBEB",
+"r c #F0F0F0",
+"s c #F2F2F2",
+"t c #EEEEEE",
+"u c #ABABAB",
+"v c #B0B0B0",
+"w c #B1B1B1",
+"x c #B2B2B2",
+"y c #F1F1F1",
+"z c #F3F3F3",
+"A c #F5F5F5",
+"B c #B5B5B5",
+"C c #F6F6F6",
+"D c #F8F8F8",
+"E c #B6B6B6",
+"F c #B8B8B8",
+"G c #F7F7F7",
+" .............. ",
+" [EMAIL PROTECTED]&*==-;>, ",
+" .')!~{]^/(_:<. ",
+" .'[!~}]^/|12<. ",
+" .344567890a=b. ",
+" .44567890a=cd. ",
+" .4=ecf9ghijkl. ",
+" .5mnff0ahoppq. ",
+" .67890a=edlij. ",
+" .7ddlh=epkrst. ",
+" .8fuhhcdvwxxr. ",
+" .=edqijtryszA. ",
+" .ekrrxtrBACDC. ",
+" .dvwxxryBEFFG. ",
+" .qijtryszACGG. ",
+" .............. "};
Modified: trunk/pgadmin3/src/include/images/tables.xpm
===================================================================
--- trunk/pgadmin3/src/include/images/tables.xpm 2005-10-08 16:52:18 UTC
(rev 4522)
+++ trunk/pgadmin3/src/include/images/tables.xpm 2005-10-08 20:48:59 UTC
(rev 4523)
@@ -2,53 +2,53 @@
static char * tables_xpm[] = {
"16 16 63 1",
" c None",
-". c #90CAF3",
-"+ c #2195E7",
-"@ c #8ACEFE",
-"# c #94CFF9",
-"$ c #ADD5F2",
-"% c #CADCEA",
-"& c #DEE3E7",
-"* c #E6E7E7",
-"= c #E6E6E6",
-"- c #C5D8E6",
-"; c #76B9E8",
-"> c #309CE8",
-", c #88CDFE",
-"' c #52B0F2",
-") c #B3D5ED",
-"! c #DDDDDD",
-"~ c #83CBFE",
-"{ c #7AC6FB",
-"] c #6FC0F9",
-"^ c #63B9F6",
-"/ c #56B2F3",
-"( c #49ABF0",
-"_ c #3DA5ED",
-": c #319EEB",
-"< c #2799E9",
-"[ c #DEDEDE",
-"} c #83CBFD",
-"| c #4AABF0",
-"1 c #3DA4ED",
-"2 c #2899E9",
-"3 c #DFDFDF",
-"4 c #E2E2E2",
-"5 c #E3E3E3",
-"6 c #E5E5E5",
-"7 c #87C0E7",
-"8 c #E0E0E0",
-"9 c #A7A7A7",
-"0 c #ACACAC",
-"a c #ECECEC",
-"b c #EEEEEE",
-"c c #E9E9E9",
-"d c #E1E1E1",
-"e c #A6A6A6",
-"f c #A8A8A8",
-"g c #ADADAD",
-"h c #AFAFAF",
-"i c #EAEAEA",
+". c #2195E7",
+"+ c #8ACEFE",
+"@ c #94CFF9",
+"# c #ADD5F2",
+"$ c #CADCEA",
+"% c #DEE3E7",
+"& c #E6E7E7",
+"* c #E6E6E6",
+"= c #C5D8E6",
+"- c #76B9E8",
+"; c #309CE8",
+"> c #88CDFE",
+", c #52B0F2",
+"' c #B3D5ED",
+") c #DDDDDD",
+"! c #83CBFE",
+"~ c #7AC6FB",
+"{ c #6FC0F9",
+"] c #63B9F6",
+"^ c #56B2F3",
+"/ c #49ABF0",
+"( c #3DA5ED",
+"_ c #319EEB",
+": c #2799E9",
+"< c #DEDEDE",
+"[ c #83CBFD",
+"} c #4AABF0",
+"| c #3DA4ED",
+"1 c #2899E9",
+"2 c #DFDFDF",
+"3 c #E2E2E2",
+"4 c #E3E3E3",
+"5 c #E5E5E5",
+"6 c #87C0E7",
+"7 c #E0E0E0",
+"8 c #A7A7A7",
+"9 c #ACACAC",
+"0 c #ECECEC",
+"a c #EEEEEE",
+"b c #E9E9E9",
+"c c #E1E1E1",
+"d c #A6A6A6",
+"e c #A8A8A8",
+"f c #ADADAD",
+"g c #AFAFAF",
+"h c #EAEAEA",
+"i c #90CAF3",
"j c #E7E7E7",
"k c #EBEBEB",
"l c #E8E8E8",
@@ -64,19 +64,19 @@
"v c #7BC6FB",
"w c #6FC0F8",
"x c #2899E8",
-".++++++++++ ",
-"[EMAIL PROTECTED]&*==-;> ",
-"+,'++++++++++ ",
-"+,[EMAIL PROTECTED]&*==-;> ",
-"+)+,'++++++++++ ",
-"+!+,[EMAIL PROTECTED]&*==-;>",
-"+!+)+,~{]^/(_:<+",
-"+[+!+,}{]^/|1:2+",
-"+3+!+)!![3456=7+",
-"+8+[+!==9850abc+",
-"+d+3+!e9fd60ghi+",
-" +8+[38d4=jcik+",
-" +d+3lcm5jhnop+",
-" . +8mmq6chrsb+",
-" +d4t6=kapbu+",
-" ,~vw^/|1:x "};
+"........... ",
+"[EMAIL PROTECTED]&**=-; ",
+".>,.......... ",
+".>[EMAIL PROTECTED]&**=-; ",
+".'.>,.......... ",
+".).>[EMAIL PROTECTED]&**=-;",
+".).'.>!~{]^/(_:.",
+".<.).>[~{]^}|_1.",
+".2.).'))<2345*6.",
+".7.<.)**87490ab.",
+".c.2.)d8ec59fgh.",
+"ii.7.<27c3*jbhk.",
+" .c.2lbm4jgnop.",
+" ii.7mmq5bgrsa.",
+" .c3t5*k0pau.",
+" i>!vw]^}|_x."};
Modified: trunk/pgadmin3/src/include/pgSequence.h
===================================================================
--- trunk/pgadmin3/src/include/pgSequence.h 2005-10-08 16:52:18 UTC (rev
4522)
+++ trunk/pgadmin3/src/include/pgSequence.h 2005-10-08 20:48:59 UTC (rev
4523)
@@ -21,6 +21,9 @@
pgSequenceFactory();
virtual dlgProperty *CreateDialog(frmMain *frame, pgObject *node, pgObject
*parent);
virtual pgObject *CreateObjects(pgCollection *obj, ctlTree *browser, const
wxString &restr=wxEmptyString);
+ int GetReplicatedIconId() { return replicatedIconId; }
+private:
+ int replicatedIconId;
};
extern pgSequenceFactory sequenceFactory;
@@ -29,6 +32,7 @@
public:
pgSequence(pgSchema *newSchema, const wxString& newName = wxT(""));
~pgSequence();
+ int GetIconId();
void ShowTreeDetail(ctlTree *browser, frmMain *form=0, ctlListView
*properties=0, ctlSQLBox *sqlPane=0);
void ShowStatistics(frmMain *form, ctlListView *statistics);
@@ -48,7 +52,7 @@
private:
wxULongLong lastValue, minValue, maxValue, cacheValue, increment;
- bool cycled;
+ bool cycled, isReplicated;
};
#endif
Modified: trunk/pgadmin3/src/include/pgTable.h
===================================================================
--- trunk/pgadmin3/src/include/pgTable.h 2005-10-08 16:52:18 UTC (rev
4522)
+++ trunk/pgadmin3/src/include/pgTable.h 2005-10-08 20:48:59 UTC (rev
4523)
@@ -31,6 +31,9 @@
virtual dlgProperty *CreateDialog(frmMain *frame, pgObject *node, pgObject
*parent);
virtual pgObject *CreateObjects(pgCollection *obj, ctlTree *browser, const
wxString &restr=wxEmptyString);
virtual pgCollection *CreateCollection(pgObject *obj);
+ int GetReplicatedIconId() { return replicatedIconId; }
+private:
+ int replicatedIconId;
};
extern pgTableFactory tableFactory;
@@ -40,6 +43,7 @@
public:
pgTable(pgSchema *newSchema, const wxString& newName = wxT(""));
~pgTable();
+ int GetIconId();
void ShowTreeDetail(ctlTree *browser, frmMain *form=0, ctlListView
*properties=0, ctlSQLBox *sqlPane=0);
void ShowHint(frmMain *form, bool force);
@@ -70,6 +74,8 @@
wxString GetCoveringIndex(ctlTree *browser, const wxString &collist);
bool GetHasSubclass() const { return hasSubclass; }
void iSetHasSubclass(bool b) { hasSubclass = b; }
+ void iSetIsReplicated(bool b) { isReplicated = b; }
+ bool GetIsReplicated() const { return isReplicated; }
void UpdateRows();
bool DropObject(wxFrame *frame, ctlTree *browser, bool cascaded);
bool CanView() { return true; }
@@ -91,7 +97,7 @@
void AppendStuff(wxString &sql, ctlTree *browser, pgaFactory &factory);
wxULongLong rows;
double estimatedRows;
- bool hasOids, hasSubclass, rowsCounted;
+ bool hasOids, hasSubclass, rowsCounted, isReplicated;
long inheritedTableCount;
wxString quotedInheritedTables, inheritedTables, primaryKey,
quotedPrimaryKey,
primaryKeyName, primaryKeyColNumbers, tablespace;
Modified: trunk/pgadmin3/src/main/events.cpp
===================================================================
--- trunk/pgadmin3/src/main/events.cpp 2005-10-08 16:52:18 UTC (rev 4522)
+++ trunk/pgadmin3/src/main/events.cpp 2005-10-08 20:48:59 UTC (rev 4523)
@@ -456,43 +456,44 @@
menuFactories->AppendEnabledMenus(menuBar, treeContextMenu);
wxMenuItem *newItem=treeContextMenu->FindItem(newMenuFactory->GetId());
- wxASSERT(newItem);
- size_t newItemPos;
-
- wxMenuItemList mil = treeContextMenu->GetMenuItems();
- for (newItemPos=0 ; newItemPos < mil.GetCount() ; newItemPos++)
+ if (newItem)
{
- if (mil.Item(newItemPos)->GetData()->GetId() == newItem->GetId())
- break;
- }
+ size_t newItemPos;
- if (object)
- {
- wxMenu *indivMenu=object->GetNewMenu();
- if (indivMenu)
+ wxMenuItemList mil = treeContextMenu->GetMenuItems();
+ for (newItemPos=0 ; newItemPos < mil.GetCount() ; newItemPos++)
{
- if (indivMenu->GetMenuItemCount() > 1)
+ if (mil.Item(newItemPos)->GetData()->GetId() == newItem->GetId())
+ break;
+ }
+
+ if (object)
+ {
+ wxMenu *indivMenu=object->GetNewMenu();
+ if (indivMenu)
{
- wxMenuItem *menuItem =
menuBar->FindItem(newMenuFactory->GetId());
- treeContextMenu->Insert(newItemPos, newMenuFactory->GetId(),
menuItem->GetLabel(), indivMenu, menuItem->GetHelp());
- }
- else
- {
- if (indivMenu->GetMenuItemCount() == 1)
+ if (indivMenu->GetMenuItemCount() > 1)
{
- wxMenuItem
*menuItem=indivMenu->GetMenuItems().Item(0)->GetData();
- treeContextMenu->Insert(newItemPos, menuItem->GetId(),
menuItem->GetLabel(), menuItem->GetHelp());
+ wxMenuItem *menuItem =
menuBar->FindItem(newMenuFactory->GetId());
+ treeContextMenu->Insert(newItemPos,
newMenuFactory->GetId(), menuItem->GetLabel(), indivMenu, menuItem->GetHelp());
}
- delete indivMenu;
+ else
+ {
+ if (indivMenu->GetMenuItemCount() == 1)
+ {
+ wxMenuItem
*menuItem=indivMenu->GetMenuItems().Item(0)->GetData();
+ treeContextMenu->Insert(newItemPos, menuItem->GetId(),
menuItem->GetLabel(), menuItem->GetHelp());
+ }
+ delete indivMenu;
+ }
}
}
+
+ treeContextMenu->Remove(newItem);
+ delete newItem;
}
- treeContextMenu->Remove(newItem);
- delete newItem;
-
-
if (treeContextMenu->GetMenuItemCount())
win->PopupMenu(treeContextMenu, point);
}
Modified: trunk/pgadmin3/src/schema/pgSequence.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgSequence.cpp 2005-10-08 16:52:18 UTC (rev
4522)
+++ trunk/pgadmin3/src/schema/pgSequence.cpp 2005-10-08 20:48:59 UTC (rev
4523)
@@ -21,12 +21,21 @@
pgSequence::pgSequence(pgSchema *newSchema, const wxString& newName)
: pgSchemaObject(newSchema, sequenceFactory, newName)
{
+ isReplicated=false;
}
pgSequence::~pgSequence()
{
}
+int pgSequence::GetIconId()
+{
+ if (isReplicated)
+ return sequenceFactory.GetReplicatedIconId();
+ else
+ return sequenceFactory.GetIconId();
+}
+
bool pgSequence::DropObject(wxFrame *frame, ctlTree *browser, bool cascaded)
{
wxString sql = wxT("DROP SEQUENCE ") + GetQuotedFullIdentifier();
Modified: trunk/pgadmin3/src/schema/pgTable.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgTable.cpp 2005-10-08 16:52:18 UTC (rev
4522)
+++ trunk/pgadmin3/src/schema/pgTable.cpp 2005-10-08 20:48:59 UTC (rev
4523)
@@ -41,6 +41,15 @@
}
+int pgTable::GetIconId()
+{
+ if (isReplicated)
+ return tableFactory.GetReplicatedIconId();
+ else
+ return tableFactory.GetIconId();
+}
+
+
wxMenu *pgTable::GetNewMenu()
{
wxMenu *menu=pgObject::GetNewMenu();
@@ -624,11 +633,15 @@
pgTable *table=0;
pgSet *tables;
- if (collection->GetConnection()->BackendMinimumVersion(7, 5))
+ if (collection->GetConnection()->BackendMinimumVersion(8, 0))
{
tables= collection->GetDatabase()->ExecuteSet(
wxT("SELECT rel.oid, relname, spcname, pg_get_userbyid(relowner)
AS relowner, relacl, relhasoids, ")
- wxT("relhassubclass, reltuples, description, conname,
conkey\n")
+ wxT("relhassubclass, reltuples, description, conname,
conkey,\n")
+ wxT(" EXISTS(select 1 FROM pg_trigger\n")
+ wxT(" JOIN pg_proc pt ON pt.oid=tgfoid AND
pt.proname='logtrigger'\n")
+ wxT(" JOIN pg_proc pc ON
pc.pronamespace=pt.pronamespace AND pc.proname='slonyversion'\n")
+ wxT(" WHERE tgrelid=rel.oid) AS isrepl\n")
wxT(" FROM pg_class rel\n")
wxT(" LEFT OUTER JOIN pg_tablespace ta on
ta.oid=rel.reltablespace\n")
wxT(" LEFT OUTER JOIN pg_description des ON des.objoid=rel.oid
AND des.objsubid=0\n")
@@ -641,7 +654,11 @@
{
tables= collection->GetDatabase()->ExecuteSet(
wxT("SELECT rel.oid, relname, pg_get_userbyid(relowner) AS
relowner, relacl, relhasoids, ")
- wxT("relhassubclass, reltuples, description, conname,
conkey\n")
+ wxT("relhassubclass, reltuples, description, conname,
conkey,\n")
+ wxT(" EXISTS(select 1 FROM pg_trigger\n")
+ wxT(" JOIN pg_proc pt ON pt.oid=tgfoid AND
proname='logtrigger'\n")
+ wxT(" JOIN pg_proc pc ON
pc.pronamespace=pt.pronamespace AND proname='slonyversion'\n")
+ wxT(" WHERE tgrelid=rel.oid) AS isrepl\n")
wxT(" FROM pg_class rel\n")
wxT(" LEFT OUTER JOIN pg_description des ON des.objoid=rel.oid
AND des.objsubid=0\n")
wxT(" LEFT OUTER JOIN pg_constraint c ON c.conrelid=rel.oid AND
c.contype='p'\n")
@@ -665,6 +682,7 @@
table->iSetEstimatedRows(tables->GetDouble(wxT("reltuples")));
table->iSetHasSubclass(tables->GetBool(wxT("relhassubclass")));
table->iSetPrimaryKeyName(tables->GetVal(wxT("conname")));
+ table->iSetIsReplicated(tables->GetBool(wxT("isrepl")));
wxString cn=tables->GetVal(wxT("conkey"));
cn=cn.Mid(1, cn.Length()-2);
table->iSetPrimaryKeyColNumbers(cn);
@@ -685,6 +703,8 @@
#include "images/table.xpm"
+#include "images/table-repl.xpm"
+#include "images/table-repl-sm.xpm"
#include "images/table-sm.xpm"
#include "images/tables.xpm"
@@ -692,6 +712,10 @@
: pgSchemaObjFactory(__("Table"), __("New Table"), __("Create a new Table."),
table_xpm, table_sm_xpm)
{
metaType = PGM_TABLE;
+ if (WantSmallIcon())
+ replicatedIconId = addIcon(table_repl_sm_xpm);
+ else
+ replicatedIconId = addIcon(table_repl_xpm);
}
pgCollection *pgTableFactory::CreateCollection(pgObject *obj)
Modified: trunk/pgadmin3/src/slony/include/slCluster.h
===================================================================
--- trunk/pgadmin3/src/slony/include/slCluster.h 2005-10-08 16:52:18 UTC
(rev 4522)
+++ trunk/pgadmin3/src/slony/include/slCluster.h 2005-10-08 20:48:59 UTC
(rev 4523)
@@ -115,7 +115,7 @@
class slObjFactory : public pgDatabaseObjFactory
{
public:
- slObjFactory(const wxChar *tn, const wxChar *ns, const wxChar *nls, char
**img) : pgDatabaseObjFactory(tn, ns, nls, img) {}
+ slObjFactory(const wxChar *tn, const wxChar *ns, const wxChar *nls, char
**img, char **smImg=0) : pgDatabaseObjFactory(tn, ns, nls, img, smImg) {}
virtual pgCollection *CreateCollection(pgObject *obj);
};
Modified: trunk/pgadmin3/src/slony/include/slSet.h
===================================================================
--- trunk/pgadmin3/src/slony/include/slSet.h 2005-10-08 16:52:18 UTC (rev
4522)
+++ trunk/pgadmin3/src/slony/include/slSet.h 2005-10-08 20:48:59 UTC (rev
4523)
@@ -103,7 +103,7 @@
class slSetObjFactory : public slObjFactory
{
public:
- slSetObjFactory(const wxChar *tn, const wxChar *ns, const wxChar *nls,
char **img) : slObjFactory(tn, ns, nls, img) {}
+ slSetObjFactory(const wxChar *tn, const wxChar *ns, const wxChar *nls,
char **img, char **smImg=0) : slObjFactory(tn, ns, nls, img, smImg) {}
virtual pgCollection *CreateCollection(pgObject *obj);
};
Modified: trunk/pgadmin3/src/slony/slSequence.cpp
===================================================================
--- trunk/pgadmin3/src/slony/slSequence.cpp 2005-10-08 16:52:18 UTC (rev
4522)
+++ trunk/pgadmin3/src/slony/slSequence.cpp 2005-10-08 20:48:59 UTC (rev
4523)
@@ -138,11 +138,11 @@
///////////////////////////////////////////////////
-#include "images/sequence.xpm"
+#include "images/sequence-repl.xpm"
#include "images/sequences.xpm"
slSlSequenceFactory::slSlSequenceFactory()
-: slSetObjFactory(__("Sequence"), __("New Sequence"), __("Create a new
Sequence."), sequence_xpm)
+: slSetObjFactory(__("Sequence"), __("New Sequence"), __("Create a new
Sequence."), sequence_repl_xpm)
{
metaType = SLM_SEQUENCE;
}
Modified: trunk/pgadmin3/src/slony/slTable.cpp
===================================================================
--- trunk/pgadmin3/src/slony/slTable.cpp 2005-10-08 16:52:18 UTC (rev
4522)
+++ trunk/pgadmin3/src/slony/slTable.cpp 2005-10-08 20:48:59 UTC (rev
4523)
@@ -167,11 +167,12 @@
///////////////////////////////////////////////////
-#include "images/table.xpm"
+#include "images/table-repl.xpm"
+#include "images/table-repl-sm.xpm"
#include "images/tables.xpm"
slSlTableFactory::slSlTableFactory()
-: slSetObjFactory(__("Table"), __("New Table"), __("Create a new Table."),
table_xpm)
+: slSetObjFactory(__("Table"), __("New Table"), __("Create a new Table."),
table_repl_xpm, table_repl_sm_xpm)
{
metaType = SLM_TABLE;
}
---------------------------(end of broadcast)---------------------------
TIP 6: explain analyze is your friend
