wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

postgre fix

Browse Source 
git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/trunk@87 4cb57b5f-5bbd-dd11-951b-001d605cbbc5
This commit is contained in:
akulikov
2009-05-06 12:28:25 +00:00
parent f68625500a
commit 74ce05ebc0
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/DBConnector.class.php
View File

@ -131,7 +131,7 @@ class DBConnector
return mysqli_num_rows($result);
}
static public function affectedRows($handler)
static public function affectedRows($handler, $result)
{
return mysqli_affected_rows($handler);
}

12
classes/Model.class.php
View File

@ -61,9 +61,9 @@ abstract class Model
return new ModelSelectResult($res);
case 'insert':
case 'replac':
return new ModelInsertResult($this->handler);
return new ModelInsertResult($this->handler, $res); //$res for postgreSQL
default:
return new ModelChangeResult($this->handler);
return new ModelChangeResult($this->handler, $res); //$res for postgreSQL
}
}
@ -224,9 +224,9 @@ class ModelChangeResult extends ModelResult
{
public $affected;
function __construct($resource)
function __construct($resource, $result)
{
$this->affected = DBConnector::affectedRows($resource);
$this->affected = DBConnector::affectedRows($resource, $result);
}
function count()
@ -239,9 +239,9 @@ class ModelInsertResult extends ModelChangeResult
{
public $id;
function __construct($resource)
function __construct($resource, $result)
{
parent::__construct($resource);
parent::__construct($resource, $result);
$this->id = DBConnector::getId($resource);
}

10
classes/pg_DBConnector.class.php
View File

@ -38,10 +38,10 @@ class DBConnector
return self::$handlers[$handler_name];
}
if (!$handler = pg_connect("host='".$db_settings['host']."' dbname='".$db_settings['database']."' user='".$db_settings['user'].'" password="'.$db_settings['password']."'")) {
throw new MJException('Can\'t connect to DB '.pg_last_error($handler), 2);
if (!$handler = pg_connect("host='".$db_settings['host']."' dbname='".$db_settings['database']."' user='".$db_settings['user']."' password='".$db_settings['password']."'")) {
throw new MJException('Can\'t connect to DB '.pg_last_error(), 2);
}
return self::$handlers[$handler_name] = $handler;
}
@ -82,9 +82,9 @@ class DBConnector
return pg_num_rows($result);
}
static public function affectedRows($handler)
static public function affectedRows($handler, $result)
{
return pg_affected_rows($handler);
return pg_affected_rows($result);
}
static public function getId($handler)