adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added patch from Ticket #1229

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3350 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-08-01 21:58:13 +00:00
parent d8c447013e
commit cf6d284b29
1 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,34 +41,32 @@ uses ('model' . DS . 'datasources' . DS . 'dbo_source');
* @package cake
* @subpackage cake.cake.libs.model.dbo
*/
class DboPostgres extends DboSource {
class DboPostgres extends DboSource{
var $description = "PostgreSQL DBO Driver";
var $_baseConfig = array(
'connect' => 'pg_pconnect',
'persistent' => true,
'host' => 'localhost',
'login' => 'root',
'password' => '',
'database' => 'cake',
'port' => 5432,
'connect' => 'pg_pconnect'
'port' => 5432
);
var $columns = array(
'primary_key' => array('name' => 'serial NOT NULL'),
'string' => array('name' => 'varchar', 'limit' => '255'),
'text' => array('name' => 'text'),
'integer' => array('name' => 'integer'),
'float' => array('name' => 'float'),
'datetime' => array('name' => 'timestamp'),
'timestamp' => array('name' => 'timestamp'),
'time' => array('name' => 'time'),
'date' => array('name' => 'date'),
'binary' => array('name' => 'bytea'),
'boolean' => array('name' => 'boolean'),
'number' => array('name' => 'numeric')
);
var $columns = array('primary_key' => array('name' => 'serial NOT NULL'),
'string' => array('name' => 'varchar', 'limit' => '255'),
'text' => array('name' => 'text'),
'integer' => array('name' => 'integer'),
'float' => array('name' => 'float'),
'datetime' => array('name' => 'timestamp'),
'timestamp' => array('name' => 'timestamp'),
'time' => array('name' => 'time'),
'date' => array('name' => 'date'),
'binary' => array('name' => 'bytea'),
'boolean' => array('name' => 'boolean'),
'number' => array('name' => 'numeric'),
'inet' => array('name' => 'inet'));
var $startQuote = '"';
@ -224,6 +222,13 @@ class DboPostgres extends DboSource {
}
switch($column) {
case 'inet':
if (!strlen($data)){
return 'DEFAULT';
} else {
$data = pg_escape_string($data);
}
break;
case 'integer':
if ($data === '') {
return 'DEFAULT';
@ -445,6 +450,9 @@ class DboPostgres extends DboSource {
if (strpos($col, 'timestamp') !== false) {
return 'datetime';
}
if ($col == 'inet') {
return('inet');
}
if ($col == 'boolean') {
return 'boolean';
}