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

rfe #1927189 strip ` from column names on import

Browse Source
This commit is contained in:
Michal Čihař
2008-11-30 14:20:25 +00:00
parent ec305517f1
commit 28b8e9448a
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- rfe #2127987 warn when session.gc_maxlifetime is less than cookie validity - rfe #2127987 warn when session.gc_maxlifetime is less than cookie validity
- rfe #2100910 configurable default charset for import - rfe #2100910 configurable default charset for import
- rfe #1913541 link to InnoDB status when error 1005 occurs - rfe #1913541 link to InnoDB status when error 1005 occurs
- rfe #1927189 strip ` from column names on import
3.1.1.0 (not yet released) 3.1.1.0 (not yet released)
- patch #2242765 [core] Navi panel server links wrong, - patch #2242765 [core] Navi panel server links wrong,

3
libraries/import/csv.php
View File

@@ -96,7 +96,8 @@ if (empty($csv_columns)) {
if (count($fields) > 0) { if (count($fields) > 0) {
$sql_template .= ', '; $sql_template .= ', ';
} }
$val = trim($val); /* Trim also `, if user already included backquoted fields */
$val = trim($val, " \t\r\n\0\x0B`");
$found = FALSE; $found = FALSE;
foreach ($tmp_fields as $id => $field) { foreach ($tmp_fields as $id => $field) {
if ($field['Field'] == $val) { if ($field['Field'] == $val) {

3
libraries/import/ldi.php
View File

@@ -96,7 +96,8 @@ if (strlen($ldi_columns) > 0) {
if ($i > 0) { if ($i > 0) {
$sql .= ', '; $sql .= ', ';
} }
$sql .= PMA_backquote(trim($tmp[$i])); /* Trim also `, if user already included backquoted fields */
$sql .= PMA_backquote(trim($tmp[$i], " \t\r\n\0\x0B`"));
} // end for } // end for
$sql .= ')'; $sql .= ')';
} }