More cool Slony stuff

diff --git a/classes/plugins/Slony.php b/classes/plugins/Slony.php
index 4193255f7f0d5a6c6cb51d7ab7af776c497b125e..8e858f02a6d96b3e52ec0da609d7e18bdd4404e9 100755 (executable)
--- a/classes/plugins/Slony.php
+++ b/classes/plugins/Slony.php
@@ -3,7 +3,7 @@
 /**
  * A class that implements the Slony 1.0.x support plugin
  *
- * $Id: Slony.php,v 1.1.2.3 2005/05/22 14:29:08 chriskl Exp $
+ * $Id: Slony.php,v 1.1.2.4 2005/05/24 13:02:02 chriskl Exp $
  */
 
 include_once('./classes/plugins/Plugin.php');
@@ -150,15 +150,38 @@ class Slony extends Plugin {
                $data->fieldClean($schema);
                $data->clean($set_id);          
 
-               $sql = "SELECT c.relname
-                                       FROM pg_catalog.pg_class c, \"{$schema}\".sl_table st
+               $sql = "SELECT c.relname, n.nspname
+                                       FROM pg_catalog.pg_class c, \"{$schema}\".sl_table st, pg_catalog.pg_namespace n
                                        WHERE c.oid=st.tab_reloid
+                                       AND c.relnamespace=n.oid
                                        AND st.tab_set='{$set_id}'
                                        ORDER BY c.relname";
 
                return $data->selectSet($sql);
        }
 
+       /**
+        * Return all sequences in a replication set
+        * @param $set_id The ID of the replication set
+        * @return Sequences in the replication set, sorted alphabetically 
+        */
+       function &getSequences($set_id) {
+               global $data;
+
+               $schema = $this->slony_schema;
+               $data->fieldClean($schema);
+               $data->clean($set_id);          
+
+               $sql = "SELECT c.relname AS seqname, n.nspname
+                                       FROM pg_catalog.pg_class c, \"{$schema}\".sl_sequence ss, pg_catalog.pg_namespace n
+                                       WHERE c.oid=ss.seq_reloid
+                                       AND c.relnamespace=n.oid
+                                       AND ss.seq_set='{$set_id}'
+                                       ORDER BY c.relname";
+
+               return $data->selectSet($sql);
+       }
+
 }
 
 ?>

diff --git a/plugin_slony.php b/plugin_slony.php
index a688d41f23359ffb7f58757f6fb557f7dbc19e5b..c30e9a1f42d21d958b125a8ed759022d7a5901f1 100755 (executable)
--- a/plugin_slony.php
+++ b/plugin_slony.php
@@ -3,7 +3,7 @@
        /**
         * Slony database tab plugin
         *
-        * $Id: plugin_slony.php,v 1.1.2.2 2005/05/22 14:29:08 chriskl Exp $
+        * $Id: plugin_slony.php,v 1.1.2.3 2005/05/24 13:02:01 chriskl Exp $
         */
 
        // Include application functions
@@ -160,13 +160,14 @@
                                        'action' => url('redirect.php',
                                                                        $reqvars,
                                                                        array(
-                                                                               'subject' => 'slony_node'
+                                                                               'set_id' => field('set_id')
                                                                        )
                                                                ),
                                        'branch' => url('plugin_slony.php',
                                                                        $reqvars,
                                                                        array(
-                                                                               'action'  => 'sets_top'
+                                                                               'action'  => 'sets_top',
+                                                                               'set_id' => field('set_id')
                                                                        )
                                                                )
                                );
@@ -193,7 +194,7 @@
                                        'branch' => url(field('url'),
                                                                        $reqvars,
                                                                        field('urlvars'),
-                                                                       array('action' => 'subscriptions')
+                                                                       array('action' => 'subscriptions', 'set_id' => $_REQUEST['set_id'])
                                                                ),
                                        'nofoot' => true
                                );
@@ -218,7 +219,7 @@
                                        'branch' => url(field('url'),
                                                                        $reqvars,
                                                                        field('urlvars'),
-                                                                       array('action' => 'tables', 'set_id' => XXXXXXXXXHERE)
+                                                                       array('action' => 'tables', 'set_id' => $_REQUEST['set_id'])
                                                                ),
                                        'nohead' => true,
                                        'nofoot' => true
@@ -244,7 +245,7 @@
                                        'branch' => url(field('url'),
                                                                        $reqvars,
                                                                        field('urlvars'),
-                                                                       array('action' => 'sequences')
+                                                                       array('action' => 'sequences', 'set_id' => $_REQUEST['set_id'])
                                                                ),
                                        'nohead' => true
                                );
@@ -263,7 +264,29 @@
                                        'toolTip'=> field('relcomment'),
                                        'action' => url('redirect.php',
                                                                        $reqvars,
-                                                                       array('table' => field('relname'))
+                                                                       array('table' => field('relname'), 'schema' => field('nspname'))
+                                                               )
+                               );
+                               
+                               $misc->printTreeXML($tables, $attrs);
+                       
+                               break;
+                       case 'sequences':
+                               $tables = &$slony->getSequences($_REQUEST['set_id']);
+                               
+                               $reqvars = $misc->getRequestVars('sequence');
+
+                               $attrs = array(
+                                       'text'   => field('seqname'),
+                                       'icon'   => 'sequences',
+                                       'toolTip'=> field('seqcomment'),
+                                       'action' => url('sequences.php',
+                                                                       $reqvars,
+                                                                       array (
+                                                                               'action' => 'properties',
+                                                                               'sequence' => field('seqname'),
+                                                                               'schema' => field('nspname')
+                                                                       )
                                                                )
                                );