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

Feature request #723

Browse Source 
Signed-off-by: RAKESH KUMAR <rakeshkumar4294@gmail.com>
This commit is contained in:
RAKESH KUMAR 2015-02-09 01:46:07 +05:30
parent 66c3491041
commit cf2f80aa4a
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/create_addfield.lib.php
View File

@ -261,7 +261,7 @@ function PMA_getTableCreationQuery($db, $table)
// Builds the 'create table' statement
$sql_query = 'CREATE TABLE ' . PMA_Util::backquote($db) . '.'
. PMA_Util::backquote($table) . ' (' . $sql_statement . ')';
. PMA_Util::backquote(trim($table)) . ' (' . $sql_statement . ')';
// Adds table type, character set, comments and partition definition
if (!empty($_REQUEST['tbl_storage_engine'])

25
tbl_structure.php
View File

@ -45,23 +45,32 @@ if (isset($_REQUEST['reserved_word_check'])) {
$response = PMA_Response::getInstance();
if ($GLOBALS['cfg']['ReservedWordDisableWarning'] === false) {
$columns_names = $_REQUEST['field_name'];
$reserved_keywords_columns = array();
$reserved_keywords_names = array();
$reserved_keywords_fields = array();
foreach ($columns_names as $column) {
if (PMA_SQP_isKeyWord($column)) {
$reserved_keywords_columns[] = $column;
if (PMA_SQP_isKeyWord(trim($column))) {
$reserved_keywords_names[] = trim($column);
}
}
if (count($reserved_keywords_columns) == 0) {
if (count($reserved_keywords_names) > 0) {
$reserved_keywords_fields[] = 'Column';
}
if (PMA_SQP_isKeyWord(trim($table))) {
$reserved_keywords_fields[] = 'Table';
$reserved_keywords_names[] = trim($table);
}
if (count($reserved_keywords_names) == 0) {
$response->isSuccess(false);
}
$response->addJSON(
'message', sprintf(
_ngettext(
'The column name \'%s\' is a MySQL reserved keyword.',
'The column names \'%s\' are MySQL reserved keywords.',
count($reserved_keywords_columns)
'The %s name \'%s\' is a MySQL reserved keyword.',
'The %s names \'%s\' are MySQL reserved keywords.',
count($reserved_keywords_names)
),
implode(',', $reserved_keywords_columns)
implode(' and ', $reserved_keywords_fields),
implode(',', $reserved_keywords_names)
)
);
} else {