adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing silent errors in PDO dbo's when a connection exception is created.

Browse source 
Adding the host param for mysql.
Adding a test for mysql missing the host param.
Fixes #1427
This commit is contained in:
mark_story 2011-01-03 23:34:22 -05:00
parent d3d009588d
commit de6eda964e
4 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/model/datasources/dbo/dbo_mysql.php
View file

@ -148,14 +148,14 @@ class DboMysql extends DboSource {
$flags[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $config['encoding']; $flags[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $config['encoding'];
} }
$this->_connection = new PDO( $this->_connection = new PDO(
"mysql:{$config['host']};port={$config['port']};dbname={$config['database']}", "mysql:host={$config['host']};port={$config['port']};dbname={$config['database']}",
$config['login'], $config['login'],
$config['password'], $config['password'],
$flags $flags
); );
$this->connected = true; $this->connected = true;
} catch (PDOException $e) { } catch (PDOException $e) {
$this->errors[] = $e->getMessage(); throw new MissingConnectionException(array('class' => $e->getMessage()));
} }
$this->_useAlias = (bool)version_compare($this->getVersion(), "4.1", ">="); $this->_useAlias = (bool)version_compare($this->getVersion(), "4.1", ">=");

2
cake/libs/model/datasources/dbo/dbo_postgres.php
View file

@ -130,7 +130,7 @@ class DboPostgres extends DboSource {
$this->_execute('SET search_path TO ' . $config['schema']); $this->_execute('SET search_path TO ' . $config['schema']);
} }
} catch (PDOException $e) { } catch (PDOException $e) {
$this->errors[] = $e->getMessage(); throw new MissingConnectionException(array('class' => $e->getMessage()));
} }
return $this->connected; return $this->connected;

5
cake/libs/model/datasources/dbo/dbo_sqlite.php
View file

@ -114,9 +114,8 @@ class DboSqlite extends DboSource {
$this->_connection = new PDO('sqlite:' . $config['database'], null, null, $flags); $this->_connection = new PDO('sqlite:' . $config['database'], null, null, $flags);
$this->_connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $this->_connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->connected = true; $this->connected = true;
} } catch(PDOException $e) {
catch(PDOException $e) { throw new MissingConnectionException(array('class' => $e->getMessage()));
$this->errors[] = $e->getMessage();
} }
return $this->connected; return $this->connected;
} }

14
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
View file

@ -3367,4 +3367,18 @@ class DboMysqlTest extends CakeTestCase {
$this->assertTrue(Set::matches('/Comment[id=2]', $result)); $this->assertTrue(Set::matches('/Comment[id=2]', $result));
$this->assertFalse(Set::matches('/Comment[id=10]', $result)); $this->assertFalse(Set::matches('/Comment[id=10]', $result));
} }
/**
* @expectedException MissingConnectionException
* @return void
*/
function testExceptionOnBrokenConnection() {
$dbo = new DboMysql(array(
'driver' => 'mysql',
'host' => 'imaginary_host',
'login' => 'mark',
'password' => 'inyurdatabase',
'database' => 'imaginary'
));
}
} }