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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-02-06 10:25:32 +01:00
commit 4b2af0c92c
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -34,6 +34,7 @@ phpMyAdmin - ChangeLog
- bug Fix isCanvasSupported for new window
+ rfe #1600 Clarify the "Inline" link
+ rfe #1179 Speed up slow triggers by using EVENT_OBJECT_SCHEMA
+ rfe #1192 ON DUPLICATE KEY UPDATE for loading CSV
4.3.10.0 (not yet released)

18
libraries/plugins/import/ImportCsv.class.php
View File

@ -165,13 +165,9 @@ class ImportCsv extends AbstractImportCsv
$required_fields = 0;
if (! $this->_getAnalyze()) {
if (isset($_POST['csv_replace'])) {
$sql_template = 'REPLACE';
} else {
$sql_template = 'INSERT';
if (isset($_POST['csv_ignore'])) {
$sql_template .= ' IGNORE';
}
$sql_template = 'INSERT';
if (isset($_POST['csv_ignore'])) {
$sql_template .= ' IGNORE';
}
$sql_template .= ' INTO ' . PMA_Util::backquote($table);
@ -531,6 +527,14 @@ class ImportCsv extends AbstractImportCsv
$first = false;
}
$sql .= ')';
if (isset($_POST['csv_replace'])) {
$sql .= " ON DUPLICATE KEY UPDATE ";
foreach ($fields as $field) {
$fieldName = PMA_Util::backquote($field['Field']);
$sql .= $fieldName . " = VALUES(" . $fieldName . "), ";
}
$sql = rtrim($sql, ', ');
}
/**
* @todo maybe we could add original line to verbose