Commit 3b5768b4 by Qiang Xue

avoid throwing the same type of new db exception.

parent bb6b75e7
...@@ -278,9 +278,13 @@ class Command extends \yii\base\Component ...@@ -278,9 +278,13 @@ class Command extends \yii\base\Component
return $n; return $n;
} catch (\Exception $e) { } catch (\Exception $e) {
Yii::endProfile($token, __METHOD__); Yii::endProfile($token, __METHOD__);
$message = $e->getMessage() . "\nThe SQL being executed was: $rawSql"; if ($e instanceof Exception) {
$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; throw $e;
throw new Exception($message, $errorInfo, (int)$e->getCode(), $e); } else {
$message = $e->getMessage() . "\nThe SQL being executed was: $rawSql";
$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
throw new Exception($message, $errorInfo, (int)$e->getCode(), $e);
}
} }
} }
...@@ -411,9 +415,13 @@ class Command extends \yii\base\Component ...@@ -411,9 +415,13 @@ class Command extends \yii\base\Component
return $result; return $result;
} catch (\Exception $e) { } catch (\Exception $e) {
Yii::endProfile($token, __METHOD__); Yii::endProfile($token, __METHOD__);
$message = $e->getMessage() . "\nThe SQL being executed was: $rawSql"; if ($e instanceof Exception) {
$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; throw $e;
throw new Exception($message, $errorInfo, (int)$e->getCode(), $e); } else {
$message = $e->getMessage() . "\nThe SQL being executed was: $rawSql";
$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
throw new Exception($message, $errorInfo, (int)$e->getCode(), $e);
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment