Fix #11414 Unclear export options / organization / hierarchy

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Aug 20, 2015 · 769a8aa · 769a8aa
1 parent 5a94689
commit 769a8aa
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 49 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -91,6 +91,7 @@ phpMyAdmin - ChangeLog
 - issue #10726 Do not try to set port 80 for https requests
 + issue #11394 Export/import Designer view
 +              Partition support in table Structure
++ issue #11414 Unclear export options / organization / hierarchy
 
 4.4.14.0 (not yet released)
 - issue #11367 Export after search, missing WHERE clause

diff --git a/export.php b/export.php
@@ -114,7 +114,6 @@
             'sql_create_database',
             'sql_drop_table',
             'sql_procedure_function',
-            'sql_create_table_statements',
             'sql_create_table',
             'sql_create_view',
             'sql_create_trigger',

diff --git a/js/export.js b/js/export.js
@@ -539,19 +539,6 @@ function toggle_table_select(row) {
 }
 
 AJAX.registerOnload('export.js', function () {
-    /**
-     * For SQL plugin, if "CREATE TABLE options" is checked/unchecked, check/uncheck each of its sub-options
-     */
-    var $create = $("#checkbox_sql_create_table_statements");
-    var $create_options = $("#ul_create_table_statements input");
-    $create.change(function () {
-        $create_options.prop('checked', $(this).prop("checked"));
-    });
-    $create_options.change(function () {
-        if ($create_options.is(":checked")) {
-            $create.prop('checked', true);
-        }
-    });
 
     /**
      * Disables the view output as text option if the output must be saved as a file

diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -2086,13 +2086,6 @@
  */
 $cfg['Export']['sql_header_comment'] = '';
 
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_create_table_statements']
- */
-$cfg['Export']['sql_create_table_statements'] = true;
-
 /**
  * Whether to use complete inserts, extended inserts, both, or neither
  *

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
@@ -187,8 +187,6 @@
 $strConfigExport_sql_backquotes_name
     = __('Enclose table and column names with backquotes');
 $strConfigExport_sql_compatibility_name = __('SQL compatibility mode');
-$strConfigExport_sql_create_table_statements_name
-    = __('<code>CREATE TABLE</code> options:');
 $strConfigExport_sql_dates_name = __('Creation/Update/Check dates');
 $strConfigExport_sql_delayed_name = __('Use delayed inserts');
 $strConfigExport_sql_disable_fk_name = __('Disable foreign key checks');

diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
@@ -323,13 +323,12 @@
     ':group:' . __('Structure'),
         'sql_drop_table',
         'sql_procedure_function',
-        'sql_create_table',
-        'sql_create_view',
-        'sql_create_trigger',
-        'sql_create_table_statements' => ':group',
+        'sql_create_table' => ':group',
             'sql_if_not_exists',
             'sql_auto_increment',
             ':group:end',
+        'sql_create_view',
+        'sql_create_trigger',
         'sql_backquotes',
         ':group:end',
     ':group:' . __('Data'),

diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
@@ -220,14 +220,13 @@
         ':group:end',
     ':group:' . __('Structure'),
         'Export/sql_drop_table',
-        'Export/sql_create_table',
-        'Export/sql_create_view',
-        'Export/sql_procedure_function',
-        'Export/sql_create_trigger',
-        'Export/sql_create_table_statements' => ':group',
+        'Export/sql_create_table' => ':group',
             'Export/sql_if_not_exists',
             'Export/sql_auto_increment',
             ':group:end',
+        'Export/sql_create_view',
+        'Export/sql_procedure_function',
+        'Export/sql_create_trigger',
         'Export/sql_backquotes',
         ':group:end',
     ':group:' . __('Data'),

diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
@@ -270,6 +270,19 @@ protected function setProperties()
                 );
                 $subgroup->addProperty($leaf);
 
+                $subgroup_create_table = new OptionsPropertySubgroup();
+                $subgroup_create_table->setSubgroupHeader($leaf);
+                $leaf = new BoolPropertyItem();
+                $leaf->setName('if_not_exists');
+                $leaf->setText('<code>IF NOT EXISTS</code>');
+                $subgroup_create_table->addProperty($leaf);
+                $leaf = new BoolPropertyItem();
+                $leaf->setName('auto_increment');
+                $leaf->setText('<code>AUTO_INCREMENT</code>');
+                $subgroup_create_table->addProperty($leaf);
+                $subgroup->addProperty($subgroup_create_table);
+                $structureOptions->addProperty($subgroup);
+
                 // Add view option
                 $leaf = new BoolPropertyItem();
                 $leaf->setName('create_view');
@@ -299,23 +312,6 @@ protected function setProperties()
                 );
                 $subgroup->addProperty($leaf);
 
-                // begin CREATE TABLE statements
-                $subgroup_create_table = new OptionsPropertySubgroup();
-                $leaf = new BoolPropertyItem();
-                $leaf->setName('create_table_statements');
-                $leaf->setText(__('<code>CREATE TABLE</code> options:'));
-                $subgroup_create_table->setSubgroupHeader($leaf);
-                $leaf = new BoolPropertyItem();
-                $leaf->setName('if_not_exists');
-                $leaf->setText('<code>IF NOT EXISTS</code>');
-                $subgroup_create_table->addProperty($leaf);
-                $leaf = new BoolPropertyItem();
-                $leaf->setName('auto_increment');
-                $leaf->setText('<code>AUTO_INCREMENT</code>');
-                $subgroup_create_table->addProperty($leaf);
-                $subgroup->addProperty($subgroup_create_table);
-                $structureOptions->addProperty($subgroup);
-
                 $leaf = new BoolPropertyItem();
                 $leaf->setName("backquotes");
                 $leaf->setText(