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

bug #1747215, other cases of blanks at end of line

Browse Source
This commit is contained in:
Marc Delisle
2007-07-11 19:19:32 +00:00
parent f772df4b99
commit 8ea5dfc479
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/export/sql.php
View File

@@ -682,7 +682,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE,
? PMA_backquote($table) ? PMA_backquote($table)
: '\'' . $table . '\''; : '\'' . $table . '\'';
$dump = $crlf $dump = $crlf
. PMA_exportComment(str_repeat('-', 55)) . PMA_exportComment(str_repeat('-', 56))
. $crlf . $crlf
. PMA_exportComment(); . PMA_exportComment();
@@ -804,7 +804,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
if (isset($GLOBALS['sql_ignore'])) { if (isset($GLOBALS['sql_ignore'])) {
$schema_insert .= 'IGNORE '; $schema_insert .= 'IGNORE ';
} }
$schema_insert .= PMA_backquote($table, $sql_backquotes) . ' SET '; // avoid EOL blank
$schema_insert .= PMA_backquote($table, $sql_backquotes) . ' SET';
} else { } else {
// insert or replace // insert or replace
if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'REPLACE') { if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'REPLACE') {
@@ -829,10 +830,11 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
if (isset($GLOBALS['sql_columns'])) { if (isset($GLOBALS['sql_columns'])) {
$fields = implode(', ', $field_set); $fields = implode(', ', $field_set);
$schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes) $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes)
. ' (' . $fields . ') VALUES '; // avoid EOL blank
. ' (' . $fields . ') VALUES';
} else { } else {
$schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes) $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes)
. ' VALUES '; . ' VALUES';
} }
} }
@@ -884,8 +886,12 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
$insert_line = $schema_insert; $insert_line = $schema_insert;
for ($i = 0; $i < $fields_cnt; $i++) { for ($i = 0; $i < $fields_cnt; $i++) {
if (0 == $i) {
$insert_line .= ' ';
}
if ($i > 0) { if ($i > 0) {
$insert_line .= ', '; // avoid EOL blank
$insert_line .= ',';
} }
$insert_line .= $field_set[$i] . ' = ' . $values[$i]; $insert_line .= $field_set[$i] . ' = ' . $values[$i];
} }