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

Display delimiter into SQL trace.

Browse Source 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2014-10-28 21:48:51 +01:00
parent e85b43b8b2
commit 3301bc3c8e
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libraries/plugins/import/ImportSql.class.php
View File

@ -366,15 +366,13 @@ class ImportSql extends ImportPlugin
*/
$GLOBALS['finished'] = false;
$positionDelimiter = false;
$query = null;
while (!$error && !$timeout_passed) {
if (false === $positionDelimiter) {
$newData = PMA_importGetNextChunk(200);
if ($newData === false) {
// subtract data we didn't handle yet and stop processing
$GLOBALS['offset']
-= $this->_stringFctToUse['strlen']($query);
$GLOBALS['offset'] -= $this->_dataLength;
break;
}
@ -397,27 +395,27 @@ class ImportSql extends ImportPlugin
continue;
}
$query = $this->_stringFctToUse['substr'](
$this->_data,
0,
$positionDelimiter
PMA_importRunQuery(
$this->_stringFctToUse['substr'](
$this->_data,
0,
$positionDelimiter
), //Query to execute
$this->_stringFctToUse['substr'](
$this->_data,
0,
$positionDelimiter + $this->_delimiterLength
), //Query to display
false,
$sql_data
);
$this->_setData(
$this->_stringFctToUse['substr'](
$this->_data,
$positionDelimiter + $this->_delimiterLength
)
);
PMA_importRunQuery(
$query, //Query to execute
$query, //Query to display
false,
$sql_data
);
//After execution, $buffer can be empty.
$query = null;
}
//Commit any possible data in buffers