- used wrong heuristic to measure if we were done, using a different one now.

git-svn-id: file:///svn/phpbb/trunk@6999 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-02-17 04:53:43 +00:00
parent bb7c0ded60
commit 9300c40900

View file

@ -388,15 +388,15 @@ class acp_database
case 'mysql4': case 'mysql4':
case 'mysqli': case 'mysqli':
case 'sqlite': case 'sqlite':
while (!$eof($fp)) while (($sql = $fgetd($fp, ";\n", $read, $seek, $eof)) !== false)
{ {
$db->sql_query($fgetd($fp, ";\n", $read, $seek, $eof)); $db->sql_query($sql);
} }
break; break;
case 'firebird': case 'firebird':
$delim = ";\n"; $delim = ";\n";
while (!$eof($fp)) while (($sql = $fgetd($fp, $delim, $read, $seek, $eof)) !== false)
{ {
$query = trim($fgetd($fp, $delim, $read, $seek, $eof)); $query = trim($fgetd($fp, $delim, $read, $seek, $eof));
if (substr($query, 0, 8) === 'SET TERM') if (substr($query, 0, 8) === 'SET TERM')
@ -409,9 +409,9 @@ class acp_database
break; break;
case 'postgres': case 'postgres':
while (!$eof($fp)) while (($sql = $fgetd($fp, $delim, $read, $seek, $eof)) !== false)
{ {
$query = trim($fgetd($fp, ";\n", $read, $seek, $eof)); $query = trim($sql);
$db->sql_query($query); $db->sql_query($query);
if (substr($query, 0, 4) == 'COPY') if (substr($query, 0, 4) == 'COPY')
{ {
@ -426,17 +426,17 @@ class acp_database
break; break;
case 'oracle': case 'oracle':
while (!$eof($fp)) while (($sql = $fgetd($fp, "/\n", $read, $seek, $eof)) !== false)
{ {
$db->sql_query($fgetd($fp, "/\n", $read, $seek, $eof)); $db->sql_query($sql);
} }
break; break;
case 'mssql': case 'mssql':
case 'mssql_odbc': case 'mssql_odbc':
while (!$eof($fp)) while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false)
{ {
$db->sql_query($fgetd($fp, "GO\n", $read, $seek, $eof)); $db->sql_query($sql);
} }
break; break;
} }