nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1715709 export in SQL format always includes procedures and functions

Browse Source
This commit is contained in:
Marc Delisle
2007-05-20 19:00:38 +00:00
parent 5e99166a21
commit 951b2a2f9e
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -73,6 +73,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1721002 db rename -> undefined cfgRelation, thanks to Juergen Wind - bug #1721002 db rename -> undefined cfgRelation, thanks to Juergen Wind
- bug #1721571 CREATE database privilege not always detected, - bug #1721571 CREATE database privilege not always detected,
thanks to Gordon McNaughton thanks to Gordon McNaughton
- bug #1715709 export in SQL format always includes procedures and functions
2.10.1.0 (2007-04-23) 2.10.1.0 (2007-04-23)
===================== =====================

7
libraries/config.default.php
View File

@@ -1226,6 +1226,13 @@ $cfg['Export']['sql_drop_table'] = false;
*/ */
$cfg['Export']['sql_if_not_exists'] = false; $cfg['Export']['sql_if_not_exists'] = false;
/**
*
*
* @global boolean $cfg['Export']['sql_procedure_function']
*/
$cfg['Export']['sql_procedure_function'] = false;
/** /**
* *
* *

4
libraries/export/sql.php
View File

@@ -72,6 +72,8 @@ if (isset($plugin_list)) {
array('type' => 'bool', 'name' => 'auto_increment', 'text' => 'strAddAutoIncrement'); array('type' => 'bool', 'name' => 'auto_increment', 'text' => 'strAddAutoIncrement');
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'backquotes', 'text' => 'strUseBackquotes'); array('type' => 'bool', 'name' => 'backquotes', 'text' => 'strUseBackquotes');
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf($GLOBALS['strAddClause'], 'CREATE PROCEDURE / FUNCTION'));
/* MIME stuff etc. */ /* MIME stuff etc. */
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
@@ -316,7 +318,7 @@ function PMA_exportDBFooter($db)
unset($GLOBALS['sql_constraints']); unset($GLOBALS['sql_constraints']);
} }
if (PMA_MYSQL_INT_VERSION >= 50000 && isset($GLOBALS['sql_structure'])) { if (PMA_MYSQL_INT_VERSION >= 50000 && isset($GLOBALS['sql_structure']) && isset($GLOBALS['sql_procedure_function'])) {
$procs_funcs = ''; $procs_funcs = '';
$procedure_names = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE'); $procedure_names = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');