Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit dcb26ac

Browse files
author
Jamie Snape
committed
Be consistent with capitalization of PDO driver names
1 parent d11847a commit dcb26ac

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

core/configs/database.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[production]
22
database.type = pdo
33
database.profiler = 0
4-
database.adapter = Pdo_Mysql
4+
database.adapter = PDO_MYSQL
55
database.params.host = localhost
66
database.params.port = 3306
77
database.params.username = root
@@ -11,7 +11,7 @@ database.params.dbname = midas
1111
[development]
1212
database.type = pdo
1313
database.profiler = 1
14-
database.adapter = Pdo_Mysql
14+
database.adapter = PDO_MYSQL
1515
database.params.host = localhost
1616
database.params.port = 3306
1717
database.params.username = root
@@ -21,7 +21,7 @@ database.params.dbname = midas
2121
[testing]
2222
database.type = pdo
2323
database.profiler = 1
24-
database.adapter = Pdo_Mysql
24+
database.adapter = PDO_MYSQL
2525
database.params.host = localhost
2626
database.params.port = 3306
2727
database.params.username = root

core/controllers/InstallController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ function step2Action()
154154
$databaseConfig['development']['database.params.port'] = $form->getValue('port');
155155
$databaseConfig['production']['database.params.port'] = $form->getValue('port');
156156

157-
$db = Zend_Db::factory('Pdo_Mysql', $params);
157+
$db = Zend_Db::factory('PDO_MYSQL', $params);
158158
Zend_Db_Table::setDefaultAdapter($db);
159159
Zend_Registry::set('dbAdapter', $db);
160160

@@ -186,7 +186,7 @@ function step2Action()
186186
$databaseConfig['development']['database.params.port'] = $form->getValue('port');
187187
$databaseConfig['production']['database.params.port'] = $form->getValue('port');
188188

189-
$db = Zend_Db::factory('Pdo_Pgsql', $params);
189+
$db = Zend_Db::factory('PDO_PGSQL', $params);
190190
Zend_Db_Table::setDefaultAdapter($db);
191191
Zend_Registry::set('dbAdapter', $db);
192192
$dbtype = 'PDO_PGSQL';
@@ -301,7 +301,7 @@ public function testconnectionAction()
301301
$this->_helper->viewRenderer->setNoRender();
302302
try
303303
{
304-
$db = Zend_Db::factory('Pdo_' . ucfirst($this->_getParam('type')), array(
304+
$db = Zend_Db::factory('PDO_' . strtoupper($this->_getParam('type')), array(
305305
'host' => $this->_getParam('host'),
306306
'port' => $this->_getParam('port'),
307307
'username' => $this->_getParam('username'),

core/controllers/components/UtilityComponent.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,13 @@ static function run_query_from_file($adapter, $sqlfile, $host, $username, $passw
402402
/** Function to run a MySQL script */
403403
static function run_mysql_from_file($sqlfile, $host, $username, $password, $dbname, $port)
404404
{
405-
return self::run_query_from_file('Pdo_Mysql', $sqlfile, $host, $username, $password, $dbname, $port);
405+
return self::run_query_from_file('PDO_MYSQL', $sqlfile, $host, $username, $password, $dbname, $port);
406406
}
407407

408408
/** Function to run a PostgreSQL script */
409409
static function run_pgsql_from_file($sqlfile, $host, $username, $password, $dbname, $port)
410410
{
411-
return self::run_query_from_file('Pdo_Pgsql', $sqlfile, $host, $username, $password, $dbname, $port);
411+
return self::run_query_from_file('PDO_PGSQL', $sqlfile, $host, $username, $password, $dbname, $port);
412412
}
413413

414414
/** Get the data directory */

0 commit comments

Comments
 (0)