remove several bits of trigger defintion hacks for pre-7.4 servers.

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 1d007b7d4b7c7420e9b2b91a4c860b600bc0b685..4b0199315b809c91bd0a78af2a00b7e8693225fc 100755 (executable)
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -1596,12 +1596,8 @@ class Postgres extends ADODB_base {
                if ($triggers->recordCount() > 0) {
                        $sql .= "\n-- Triggers\n\n";
                        while (!$triggers->EOF) {
-                               // Nasty hack to support pre-7.4 PostgreSQL
-                               if ($triggers->fields['tgdef'] !== null)
-                                       $sql .= $triggers->fields['tgdef'];
-                               else
-                                       $sql .= $this->getTriggerDef($triggers->fields);
 
+                               $sql .= $triggers->fields['tgdef'];
                                $sql .= ";\n";
 
                                $triggers->moveNext();
@@ -4913,6 +4909,7 @@ class Postgres extends ADODB_base {
        /**
         * A helper function for getTriggers that translates
         * an array of attribute numbers to an array of field names.
+        * Note: Only needed for pre-7.4 servers, this function is deprecated 
         * @param $trigger An array containing fields from the trigger table
         * @return The trigger definition string
         */

diff --git a/triggers.php b/triggers.php
index 7f586cb2d18bbf0424e7f65bdea8ad9156e034b8..c81b2a3ddc6bc127396c10784b06fd0d35a631ed 100644 (file)
--- a/triggers.php
+++ b/triggers.php
@@ -263,12 +263,6 @@
 
                function tgPre(&$rowdata,$actions) {
                        global $data;
-                       // Nasty hack to support pre-7.4 PostgreSQL
-                       $rowdata->fields['+tgdef'] = $rowdata->fields['tgdef'] !== null
-                                                                       ? $rowdata->fields['tgdef']
-                                                                       : $data->getTriggerDef($rowdata->fields);
-
-
                        // toggle enable/disable trigger per trigger
                        if( ! $data->phpBool( $rowdata->fields["tgenabled"] ) ) {
                                unset( $actions['disable'] );
@@ -293,7 +287,7 @@
                        ),
                        'definition' => array(
                                'title' => $lang['strdefinition'],
-                               'field' => field('+tgdef'),
+                               'field' => field('tgdef'),
                        ),
                        'function' => array(
                                'title' => $lang['strfunction'],