mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-15 02:54:28 +02:00
Code Issues Releases Wiki Activity

Read adminer.sql progressively to save memory

Browse Source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1054 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana
2009-09-01 13:09:00 +00:00
parent 61d40ec568
commit 03ba5f5284
2 changed files with 53 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
adminer/sql.inc.php
View File

@@ -8,23 +8,26 @@ if (!$error && $_POST["clear"]) {
page_header(lang('SQL command'), $error); page_header(lang('SQL command'), $error);
if (!$error && $_POST) { if (!$error && $_POST) {
$fp = false;
$query = $_POST["query"]; $query = $_POST["query"];
if ($_POST["webfile"]) { if ($_POST["webfile"]) {
$query = @file_get_contents(file_exists("adminer.sql") ? "adminer.sql" $fp = @fopen((file_exists("adminer.sql") ? "adminer.sql"
: (file_exists("adminer.sql.gz") ? "compress.zlib://adminer.sql.gz" : (file_exists("adminer.sql.gz") ? "compress.zlib://adminer.sql.gz"
: "compress.bzip2://adminer.sql.bz2" : "compress.bzip2://adminer.sql.bz2"
)); )), "rb");
$query = ($fp ? fread($fp, 1e6) : false);
} elseif ($_POST["file"]) { } elseif ($_POST["file"]) {
$query = get_file("sql_file", true); $query = get_file("sql_file", true);
} }
if (is_string($query)) { // get_file() returns error as number, file_get_contents as false if (is_string($query)) { // get_file() returns error as number, fread() as false
$space = "(\\s|/\\*.*\\*/|(#|-- )[^\n]*\n|--\n)"; $space = "(\\s|/\\*.*\\*/|(#|-- )[^\n]*\n|--\n)";
$alter_database = "(CREATE|DROP)$space+(DATABASE|SCHEMA)\\b~isU"; $alter_database = "(CREATE|DROP)$space+(DATABASE|SCHEMA)\\b~isU";
$databases = &$_SESSION["databases"][$_GET["server"]]; $databases = &$_SESSION["databases"][$_GET["server"]];
if (isset($databases) && !preg_match("~\\b$alter_database", $query)) { // quick check - may be inside string if (isset($databases) && !preg_match("~\\b$alter_database", $query)) { // quick check - may be inside string
//! false positive with $fp
session_write_close(); session_write_close();
} }
if (strlen($query) && (!$history || end($history) != $query)) { // don't add repeated if (!$fp && strlen($query) && (!$history || end($history) != $query)) { // don't add repeated
$history[] = $query; $history[] = $query;
} }
$delimiter = ";"; $delimiter = ";";
@@ -42,54 +45,55 @@ if (!$error && $_POST) {
preg_match('(' . preg_quote($delimiter) . '|[\'`"]|/\\*|-- |#|$)', $query, $match, PREG_OFFSET_CAPTURE, $offset); // should always match preg_match('(' . preg_quote($delimiter) . '|[\'`"]|/\\*|-- |#|$)', $query, $match, PREG_OFFSET_CAPTURE, $offset); // should always match
$found = $match[0][0]; $found = $match[0][0];
$offset = $match[0][1] + strlen($found); $offset = $match[0][1] + strlen($found);
if (!$found && !strlen(rtrim($query))) { if (!$found && $fp && !feof($fp)) {
break; $query .= fread($fp, 1e6);
} } else {
if (!$found || $found == $delimiter) { // end of a query if (!$found && !strlen(rtrim($query))) {
$empty = false; break;
echo "<pre class='jush-sql'>" . shorten_utf8(trim(substr($query, 0, $match[0][1]))) . "</pre>\n"; }
ob_flush(); if (!$found || $found == $delimiter) { // end of a query
flush(); // can take a long time - show the running query $empty = false;
$start = explode(" ", microtime()); // microtime(true) is available since PHP 5 echo "<pre class='jush-sql'>" . shorten_utf8(trim(substr($query, 0, $match[0][1]))) . "</pre>\n";
//! don't allow changing of character_set_results, convert encoding of displayed query ob_flush();
if (!$dbh->multi_query(substr($query, 0, $match[0][1]))) { flush(); // can take a long time - show the running query
echo "<p class='error'>" . lang('Error in query') . ": " . h($dbh->error) . "\n"; $start = explode(" ", microtime()); // microtime(true) is available since PHP 5
if ($_POST["error_stops"]) { //! don't allow changing of character_set_results, convert encoding of displayed query
break; if (!$dbh->multi_query(substr($query, 0, $match[0][1]))) {
} echo "<p class='error'>" . lang('Error in query') . ": " . h($dbh->error) . "\n";
} else { if ($_POST["error_stops"]) {
$end = explode(" ", microtime()); break;
$i = 0;
do {
$result = $dbh->store_result();
if (!$i) {
echo "<p class='time'>" . (is_object($result) ? lang('%d row(s)', $result->num_rows) . ", ": "") . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . "\n";
$i++;
} }
if (is_object($result)) { } else {
select($result, $dbh2); $end = explode(" ", microtime());
} else { $i = 0;
if (preg_match("~^$space*$alter_database", $query)) { do {
$databases = null; // clear cache $result = $dbh->store_result();
if (!$i) {
echo "<p class='time'>" . (is_object($result) ? lang('%d row(s)', $result->num_rows) . ", ": "") . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . "\n";
$i++;
} }
echo "<p class='message'>" . lang('Query executed OK, %d row(s) affected.', $dbh->affected_rows) . "\n"; if (is_object($result)) {
select($result, $dbh2);
} else {
if (preg_match("~^$space*$alter_database", $query)) {
$databases = null; // clear cache
}
echo "<p class='message'>" . lang('Query executed OK, %d row(s) affected.', $dbh->affected_rows) . "\n";
}
unset($result); // free resultset
} while ($dbh->next_result());
}
$query = substr($query, $offset);
$offset = 0;
} else { // find matching quote or comment end
while (preg_match('~' . ($found == '/*' ? '\\*/' : (ereg('-- |#', $found) ? "\n" : "$found|\\\\.")) . '|$~s', $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
$s = $match[0][0];
$offset = $match[0][1] + strlen($s);
if (!$s && $fp && !feof($fp)) {
$query .= fread($fp, 1e6);
} elseif ($s[0] != "\\") {
break;
} }
unset($result); // free resultset
} while ($dbh->next_result());
}
$query = substr($query, $offset);
$offset = 0;
} elseif (ereg('/\\*|-- |#', $found)) { // find closing part
$offset = strpos($query, ($found == "/*" ? "*/" : "\n"), $offset);
if (!$offset) {
$offset = strlen($query);
}
} else { // find matching quote
while (preg_match("~$found|\\\\.|\$~s", $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
$s = $match[0][0];
$offset = $match[0][1] + strlen($s);
if (!$s || $s == $found) {
break;
} }
} }
} }

1
todo.txt
View File

@@ -3,7 +3,6 @@ Add whisperer to fields with foreign key
Highlight found fields Highlight found fields
MySQL 5 BIT data type MySQL 5 BIT data type
Transactions in export Transactions in export
SQL query and CSV import - read file progressively to save memory
Create view and routine options Create view and routine options
Function to fix database encoding - http://php.vrana.cz/prevod-kodovani-mysql.php Function to fix database encoding - http://php.vrana.cz/prevod-kodovani-mysql.php
Highlight SQL textarea - may use external CodePress Highlight SQL textarea - may use external CodePress