Skip to content
Snippets Groups Projects
Commit ad1f47db authored by Peter Rotich's avatar Peter Rotich
Browse files

upgrader: Log SQL errors

parent d8fca6b4
No related branches found
No related tags found
No related merge requests found
...@@ -47,6 +47,8 @@ Class SetupWizard { ...@@ -47,6 +47,8 @@ Class SetupWizard {
load SQL schema - assumes MySQL && existing connection load SQL schema - assumes MySQL && existing connection
*/ */
function load_sql($schema, $prefix, $abort=true, $debug=false) { function load_sql($schema, $prefix, $abort=true, $debug=false) {
global $ost;
# Strip comments and remarks # Strip comments and remarks
$schema=preg_replace('%^\s*(#|--).*$%m', '', $schema); $schema=preg_replace('%^\s*(#|--).*$%m', '', $schema);
# Replace table prefix # Replace table prefix
...@@ -62,8 +64,10 @@ Class SetupWizard { ...@@ -62,8 +64,10 @@ Class SetupWizard {
foreach($statements as $k=>$sql) { foreach($statements as $k=>$sql) {
if(db_query($sql, false)) continue; if(db_query($sql, false)) continue;
$error = "[$sql] ".db_error(); $error = "[$sql] ".db_error();
if($abort) if ($abort)
return $this->abort($error, $debug); return $this->abort($error, $debug);
elseif ($debug && $ost)
$ost->logDBError('DB Error #'.db_errno(), $error, false);
} }
return true; return true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment