Port 'bug #3120 Events are not exported when using xml' to QA_4_2

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Oct 7, 2014 · e93e128 · e93e128
1 parent a82cb7a
commit e93e128
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
 - bug #4545 trying to favorite table while browser localStorage is disabled throws JS error
 - bug #4259 reCaptcha sound session expired problem
 - bug #4548 Inline editing a field converts tab to spaces
+- bug #3120 Events are not exported when using xml
 
 4.2.9.0 (2014-09-20)
 - bug       ajax.js responseHandler: cannot read property of null

diff --git a/export.php b/export.php
@@ -87,6 +87,7 @@
             'ods_columns',
             'json_structure_or_data',
             'xml_structure_or_data',
+            'xml_export_events',
             'xml_export_functions',
             'xml_export_procedures',
             'xml_export_tables',

diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -1995,6 +1995,13 @@
  */
 $cfg['Export']['xml_export_struc'] = true;
 
+/**
+ * Export events
+ *
+ * @global string $cfg['Export']['xml_export_events']
+ */
+$cfg['Export']['xml_export_events'] = true;
+
 /**
  * Export functions
  *

diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php
@@ -102,6 +102,10 @@ protected function setProperties()
         $structure->setText(__('Object creation options (all are recommended)'));
         // create primary items and add them to the group
         if (! PMA_DRIZZLE) {
+            $leaf = new BoolPropertyItem();
+            $leaf->setName("export_events");
+            $leaf->setText(__('Events'));
+            $structure->addProperty($leaf);
             $leaf = new BoolPropertyItem();
             $leaf->setName("export_functions");
             $leaf->setText(__('Functions'));
@@ -355,6 +359,37 @@ public function exportHeader ()
                 }
             }
 
+            if (isset($GLOBALS['xml_export_events'])
+                && $GLOBALS['xml_export_events']
+            ) {
+                if (PMA_MYSQL_INT_VERSION > 50100) {
+                    // Export events
+                    $events = $GLOBALS['dbi']->fetchResult(
+                        "SELECT EVENT_NAME FROM information_schema.EVENTS "
+                        . "WHERE EVENT_SCHEMA='" . PMA_Util::sqlAddslashes($db) . "'"
+                    );
+                    if ($events) {
+                        foreach ($events as $event) {
+                            $head .= '            <pma:event name="'
+                                . $event . '">' . $crlf;
+
+                            $sql = $GLOBALS['dbi']->getDefinition(
+                                $db, 'EVENT', $event
+                            );
+                            $sql = rtrim($sql);
+                            $sql = "                " . htmlspecialchars($sql);
+                            $sql = str_replace("\n", "\n                ", $sql);
+
+                            $head .= $sql . $crlf;
+                            $head .= '            </pma:event>' . $crlf;
+                        }
+
+                        unset($event);
+                        unset($events);
+                    }
+                }
+            }
+
             unset($result);
 
             $head .= '        </pma:database>' . $crlf;