Fix some PDO implementation stuff

develop
Sven Slootweg 12 years ago
parent 5417ccd5f6
commit 18cd2f8066

@ -360,6 +360,8 @@ abstract class CPHPDatabaseRecordClass extends CPHPBaseClass
public function InsertIntoDatabase() public function InsertIntoDatabase()
{ {
global $cphp_config, $database;
if(!empty($this->verify_query)) if(!empty($this->verify_query))
{ {
if($this->sId == 0) if($this->sId == 0)
@ -499,7 +501,15 @@ abstract class CPHPDatabaseRecordClass extends CPHPBaseClass
{ {
if($insert_mode == CPHP_INSERTMODE_INSERT) if($insert_mode == CPHP_INSERTMODE_INSERT)
{ {
$this->sId = mysql_insert_id(); /* Temporary PDO implementation. */
if(!empty($cphp_config->database->pdo))
{
$this->sId = $database->lastInsertId();
}
else
{
$this->sId = mysql_insert_id();
}
} }
$this->RefreshData(); $this->RefreshData();
@ -509,6 +519,7 @@ abstract class CPHPDatabaseRecordClass extends CPHPBaseClass
else else
{ {
$classname = get_class($this); $classname = get_class($this);
var_dump($database->errorInfo());
throw new DatabaseException("Database insertion query failed in object of type {$classname}. Error message: " . mysql_error()); throw new DatabaseException("Database insertion query failed in object of type {$classname}. Error message: " . mysql_error());
} }
} }

@ -148,9 +148,10 @@ function mysql_query_cached($query, $expiry = 60, $key = "", $exec = false)
{ {
mc_set($key, $result, $expiry); mc_set($key, $result, $expiry);
} }
$return_object = new stdClass;
$return_object->source = "database"; $return_object->source = "database";
$return_object->data = $result; $return_object->data = $data;
return $return_object; return $return_object;
} }
@ -172,10 +173,10 @@ function mysql_query_cached($query, $expiry = 60, $key = "", $exec = false)
{ {
return null; return null;
} }
elseif($statement == 0) /*elseif($statement == 0)
{ {
return false; return false;
} }*/
else else
{ {
$return_object = new stdClass(); $return_object = new stdClass();

@ -112,6 +112,7 @@ class CachedPDO extends PDO
} }
else else
{ {
/* This will fire when there are zero results AND on syntax errors. */
return null; return null;
} }
} }

Loading…
Cancel
Save