Merge pull request #546 from kasunchathuranga/exportView

Export views as if they were tables
phpmyadmin · Jul 30, 2013 · 0174f10 · 0174f10
2 parents 459d2f8 + 94ff649
commit 0174f10
Show file tree

Hide file tree

Showing 7 changed files with 242 additions and 106 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -29,6 +29,7 @@ phpMyAdmin - ChangeLog
 - bug #4024 Editing field a record is selected by makes pma load forever
 - bug #4035 Query "inline" link disappears when turning off "Explain SQL" option
 + rfe #1385 Hide tables, functions, procedures, events and views in navigation tree
+- rfe #1321 Export view as if it was a table
 
 4.0.5.0 (not yet released)
 - bug #3977 Not detected configuration storage

diff --git a/export.php b/export.php
@@ -81,6 +81,7 @@
         'sql_mime',
         'sql_use_transaction',
         'sql_disable_fk',
+        'sql_views_as_tables',
         'sql_compatibility',
         'sql_structure_or_data',
         'sql_create_database',

diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -1803,6 +1803,12 @@
  * @global boolean $cfg['Export']['sql_disable_fk']
  */
 $cfg['Export']['sql_disable_fk'] = false;
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_views_as_tables']
+ */
+$cfg['Export']['sql_views_as_tables'] = false;
 
 /**
  *

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
@@ -123,6 +123,7 @@
 $strConfigExport_sql_dates_name = __('Creation/Update/Check dates');
 $strConfigExport_sql_delayed_name = __('Use delayed inserts');
 $strConfigExport_sql_disable_fk_name = __('Disable foreign key checks');
+$strConfigExport_sql_views_as_tables_name = __('Export views as tables');
 $strConfigExport_sql_drop_database_name = sprintf(__('Add %s'), 'DROP DATABASE');
 $strConfigExport_sql_drop_table_name = sprintf(__('Add %s'), 'DROP TABLE / VIEW / PROCEDURE / FUNCTION / EVENT');
 $strConfigExport_sql_hex_for_blob_name = __('Use hexadecimal for BLOB');

diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
@@ -295,6 +295,7 @@
         ':group:end',
     'sql_use_transaction',
     'sql_disable_fk',
+    'sql_views_as_tables',
     'sql_compatibility',
     ':group:' . __('Database export options'),
         'sql_drop_database',

diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
@@ -188,6 +188,7 @@
         ':group:end',
     'Export/sql_use_transaction',
     'Export/sql_disable_fk',
+    'Export/sql_views_as_tables',
     'Export/sql_compatibility',
     ':group:' . __('Database export options'),
         'Export/sql_drop_database',