Ignore removed CREATE+ALTER mode in trigger_sql()

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index d298b0872fcbf2f5a3e2625463acca019635bd55..635fe971a38e35220b251da1a1df2d7ed27d5870 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -944,14 +944,12 @@ if (!defined("DRIVER")) {
 
        /** Get SQL commands to create triggers
        * @param string
-       * @param string
        * @return string
        */
-       function trigger_sql($table, $style) {
+       function trigger_sql($table) {
                $return = "";
                foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\")), null, "-- ") as $row) {
-                       $return .= "\n" . ($style == 'CREATE+ALTER' ? "DROP TRIGGER IF EXISTS " . idf_escape($row["Trigger"]) . ";;\n" : "")
-                       . "CREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
+                       $return .= "\nCREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
                }
                return $return;
        }

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index e7039c310a77307c1c9a0e681ad262392207987c..10f36dcab2359d25880555a9b24b7751cd1995eb 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -706,11 +706,10 @@ AND typelem = 0"
 
        /** Get SQL commands to create triggers
        * @param string
-       * @param string
        * @return string
        */
        //@TODO
-       function trigger_sql($table, $style) {
+       function trigger_sql($table) {
                $return = "";
                //foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\")), null, "-- ") as $row) {
                //      $return .= "\n" . ($style == 'CREATE+ALTER' ? "DROP TRIGGER IF EXISTS " . idf_escape($row["Trigger"]) . ";;\n" : "")

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index c9c545ccebfdb24d6517edf36d521978d74897a5..27af882cc30946a5786116b6fa6d5c405940a490 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -734,7 +734,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
        function use_sql($database) {
        }
 
-       function trigger_sql($table, $style) {
+       function trigger_sql($table) {
                return implode(get_vals("SELECT sql || ';;\n' FROM sqlite_master WHERE type = 'trigger' AND tbl_name = " . q($table)));
        }
 

diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index 5be9218ef6c871066c1d77eb02fd75983f261636..9538e778c95b2f48d902ab7902a3ff1ebd5f67f9 100644 (file)
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -92,7 +92,7 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
                                                        $fields = fields($name);
                                                        $adminer->dumpData($name, $_POST["data_style"], "SELECT *" . convert_fields($fields, $fields) . " FROM " . table($name));
                                                }
-                                               if ($is_sql && $_POST["triggers"] && $table && ($triggers = trigger_sql($name, $_POST["table_style"]))) {
+                                               if ($is_sql && $_POST["triggers"] && $table && ($triggers = trigger_sql($name))) {
                                                        echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n";
                                                }