Browse Source

Removed unnecessary instance check, fixed Sphinx schema

tags/2.0.0-rc
Alexander Makarov 11 years ago
parent
commit
b1d94e5c95
  1. 6
      extensions/sphinx/Schema.php
  2. 10
      framework/db/Command.php

6
extensions/sphinx/Schema.php

@ -60,6 +60,12 @@ class Schema extends Object
private $_builder;
/**
* @var array map of DB errors and corresponding exceptions
* If left part is found in DB error message exception class from the right part is used.
*/
public $exceptionMap = [];
/**
* @var array mapping from physical column types (keys) to abstract column types (values)
*/
public $typeMap = [

10
framework/db/Command.php

@ -782,12 +782,10 @@ class Command extends \yii\base\Component
} else {
$exceptionClass = '\yii\db\Exception';
$schema = $this->db->getSchema();
if ($schema instanceof Schema) {
$exceptionMap = $schema->exceptionMap;
foreach ($exceptionMap as $error => $class) {
if (strpos($e->getMessage(), $error) !== false) {
$exceptionClass = $class;
}
$exceptionMap = $schema->exceptionMap;
foreach ($exceptionMap as $error => $class) {
if (strpos($e->getMessage(), $error) !== false) {
$exceptionClass = $class;
}
}

Loading…
Cancel
Save