From e5cf5750cf7a0708e416dc4c97145874ba9105de Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Tue, 1 Feb 2005 20:45:46 +0000 Subject: [PATCH] Modification for datalib (modify_database) to ignore lines that start with -- as well as # (postgres) --- lib/datalib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/datalib.php b/lib/datalib.php index 8193aa42a2..0094ee2f3c 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -134,7 +134,7 @@ function commit_sql() { * Assumes that the input text (file or string) consists of * a number of SQL statements ENDING WITH SEMICOLONS. The * semicolons MUST be the last character in a line. - * Lines that are blank or that start with "#" are ignored. + * Lines that are blank or that start with "#" or "--" (postgres) are ignored. * Only tested with mysql dump files (mysqldump -p -d moodle) * * @uses $CFG @@ -171,7 +171,7 @@ function modify_database($sqlfile='', $sqlstring='') { $line = rtrim($line); $length = strlen($line); - if ($length and $line[0] <> '#') { + if ($length and $line[0] <> '#' and $line[0].$line[1] <> '--') { if (substr($line, $length-1, 1) == ';') { $line = substr($line, 0, $length-1); // strip ; $command .= $line; -- 2.39.5