Browse Source

postgre fix

git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/trunk@87 4cb57b5f-5bbd-dd11-951b-001d605cbbc5
master
akulikov 16 years ago
parent
commit
74ce05ebc0
  1. 2
      classes/DBConnector.class.php
  2. 12
      classes/Model.class.php
  3. 10
      classes/pg_DBConnector.class.php

2
classes/DBConnector.class.php

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

12
classes/Model.class.php

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

10
classes/pg_DBConnector.class.php

@ -38,10 +38,10 @@ class DBConnector
return self::$handlers[$handler_name]; 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; return self::$handlers[$handler_name] = $handler;
} }
@ -82,9 +82,9 @@ class DBConnector
return pg_num_rows($result); 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) static public function getId($handler)

Loading…
Cancel
Save