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

Fixing persistent connection handling in Postgres driver, updating fixture with unique index name, removing support for deprecated 'connect' key in database drivers, closes #4773

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7097 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-06-03 02:26:40 +00:00
parent 93864f608a
commit af16245ab0
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,7 @@ class DboMysql extends DboSource {
$connect = $config['connect']; $connect = $config['connect'];
$this->connected = false; $this->connected = false;
if (!$config['persistent'] || $config['connect'] === 'mysql_connect') { if (!$config['persistent']) {
$this->connection = mysql_connect($config['host'] . ':' . $config['port'], $config['login'], $config['password'], true); $this->connection = mysql_connect($config['host'] . ':' . $config['port'], $config['login'], $config['password'], true);
} else { } else {
$this->connection = $connect($config['host'] . ':' . $config['port'], $config['login'], $config['password']); $this->connection = $connect($config['host'] . ':' . $config['port'], $config['login'], $config['password']);

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

@ -107,8 +107,14 @@ class DboPostgres extends DboSource {
*/ */
function connect() { function connect() {
$config = $this->config; $config = $this->config;
$connect = $config['connect']; $conn = "host='{$config['host']}' port='{$config['port']}' dbname='{$config['database']}' ";
$this->connection = $connect("host='{$config['host']}' port='{$config['port']}' dbname='{$config['database']}' user='{$config['login']}' password='{$config['password']}'"); $conn .= "user='{$config['login']}' password='{$config['password']}'";
if (!$config['persistent']) {
$this->connection = pg_connect($conn, PGSQL_CONNECT_FORCE_NEW);
} else {
$this->connection = pg_pconnect($conn);
}
$this->connected = false; $this->connected = false;
if ($this->connection) { if ($this->connection) {
@ -604,8 +610,8 @@ class DboPostgres extends DboSource {
$out = preg_replace('/integer\([0-9]+\)/', 'integer', parent::buildColumn($column)); $out = preg_replace('/integer\([0-9]+\)/', 'integer', parent::buildColumn($column));
$out = str_replace('integer serial', 'serial', $out); $out = str_replace('integer serial', 'serial', $out);
if (strpos($column, 'DEFAULT DEFAULT')) { if (strpos($out, 'DEFAULT DEFAULT')) {
if ($column['null']) { if (isset($column['null']) && $column['null']) {
$out = str_replace('DEFAULT DEFAULT', 'DEFAULT NULL', $out); $out = str_replace('DEFAULT DEFAULT', 'DEFAULT NULL', $out);
} elseif (in_array($column['type'], array('integer', 'float'))) { } elseif (in_array($column['type'], array('integer', 'float'))) {
$out = str_replace('DEFAULT DEFAULT', 'DEFAULT 0', $out); $out = str_replace('DEFAULT DEFAULT', 'DEFAULT 0', $out);

2
cake/tests/fixtures/stories_tag_fixture.php vendored
View file

@ -49,7 +49,7 @@ class StoriesTagFixture extends CakeTestFixture {
var $fields = array( var $fields = array(
'story' => array('type' => 'integer', 'null' => false), 'story' => array('type' => 'integer', 'null' => false),
'tag_id' => array('type' => 'integer', 'null' => false), 'tag_id' => array('type' => 'integer', 'null' => false),
'indexes' => array('UNIQUE_TAG' => array('column'=> array('story', 'tag_id'), 'unique'=>1)) 'indexes' => array('UNIQUE_STORY_TAG' => array('column'=> array('story', 'tag_id'), 'unique'=>1))
); );
var $records = array( var $records = array(
array('story' => 1, 'tag_id' => 1) array('story' => 1, 'tag_id' => 1)