Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge

Browse Source
hg/feature/cdb-packed
botanic 11 years ago
parent 110b36dd4a d4423d956f
commit a533354df8
1 changed files with 44 additions and 55 deletions
Show Stats Download Patch File Download Diff File

59
code/web/private_php/ams/autoload/dblayer.php
Unescape Escape View File

@ -29,13 +29,13 @@
* *
*/ */
$PDOCache = array(); // $PDOCache = array();
class DBLayer { class DBLayer {
private $PDO; private $PDO;
private $host; // private $host;
private $dbname; // private $dbname;
/** /**
* The PDO object, instantiated by the constructor * The PDO object, instantiated by the constructor
@ -51,15 +51,15 @@ class DBLayer {
function __construct($db, $dbn = null) function __construct($db, $dbn = null)
{ {
global $cfg; global $cfg;
$this->host = $cfg['db'][$db]['host']; // $this->host = $cfg['db'][$db]['host'];
$this->dbname = $cfg['db'][$db]['name']; // $this->dbname = $cfg['db'][$db]['name'];
global $PDOCache; /*global $PDOCache;
if (isset($PDOCache[$this->host])) { if (isset($PDOCache[$this->host])) {
$this->PDO = $PDOCache[$this->host]['pdo']; $this->PDO = $PDOCache[$this->host]['pdo'];
} else { } else {*/
$dsn = "mysql:"; $dsn = "mysql:";
$dsn .= "host=" . $cfg['db'][$db]['host'] . ";"; $dsn .= "host=" . $cfg['db'][$db]['host'] . ";";
// $dsn .= "dbname=" . $cfg['db'][$db]['name'] . ";"; $dsn .= "dbname=" . $cfg['db'][$db]['name'] . ";"; // Comment this out when using the cache
$dsn .= "port=" . $cfg['db'][$db]['port'] . ";"; $dsn .= "port=" . $cfg['db'][$db]['port'] . ";";
$opt = array( $opt = array(
@ -68,11 +68,11 @@ class DBLayer {
PDO::ATTR_PERSISTENT => true PDO::ATTR_PERSISTENT => true
); );
$this->PDO = new PDO($dsn, $cfg['db'][$db]['user'], $cfg['db'][$db]['pass'], $opt); $this->PDO = new PDO($dsn, $cfg['db'][$db]['user'], $cfg['db'][$db]['pass'], $opt);
$PDOCache[$this->host] = array(); /* $PDOCache[$this->host] = array();
$PDOCache[$this->host]['pdo'] = $this->PDO; $PDOCache[$this->host]['pdo'] = $this->PDO;
$PDOCache[$this->host]['use'] = $this->dbname; $PDOCache[$this->host]['use'] = $this->dbname;
$this->PDO->query('USE ' . $this->dbname . ';'); // FIXME safety */ //$this->PDO->query('USE ' . $this->dbname . ';'); // FIXME safety
} /*}*/
} }
function __destruct() { function __destruct() {
@ -80,11 +80,11 @@ class DBLayer {
} }
function useDb() { function useDb() {
global $PDOCache; /*global $PDOCache;
if ($PDOCache[$this->host]['use'] != $this->dbname) { if ($PDOCache[$this->host]['use'] != $this->dbname) {
$PDOCache[$this->host]['use'] = $this->dbname; $PDOCache[$this->host]['use'] = $this->dbname;
$this->PDO->query('USE ' . $this->dbname . ';'); // FIXME safety $this->PDO->query('USE ' . $this->dbname . ';'); // FIXME safety
} }*/
} }
/** /**
@ -136,11 +136,10 @@ class DBLayer {
$lastId = $this -> PDO -> lastInsertId(); $lastId = $this -> PDO -> lastInsertId();
$this -> PDO -> commit(); $this -> PDO -> commit();
} }
catch ( Exception $e ) catch ( Exception $e ) {
{
// for rolling back the changes during transaction // for rolling back the changes during transaction
$this -> PDO -> rollBack(); // $this -> PDO -> rollBack();
throw new Exception( "error in inseting" ); throw $e; // new Exception( "error in inseting" );
} }
return $lastId; return $lastId;
} }
@ -159,13 +158,10 @@ class DBLayer {
$this->useDb(); $this->useDb();
try { try {
$sth = $this->PDO->prepare( "SELECT $param FROM $tb_name WHERE $where" ); $sth = $this->PDO->prepare( "SELECT $param FROM $tb_name WHERE $where" );
$this -> PDO -> beginTransaction();
$sth->execute( $data ); $sth->execute( $data );
$this -> PDO -> commit();
} }
catch ( Exception $e ) { catch ( Exception $e ) {
$this -> PDO -> rollBack(); throw $e; // new Exception( "error selection" );
throw new Exception( "error selection" );
return false; return false;
} }
return $sth; return $sth;
@ -184,14 +180,10 @@ class DBLayer {
$this->useDb(); $this->useDb();
try { try {
$sth = $this->PDO->prepare("SELECT * FROM $tb_name WHERE $where"); $sth = $this->PDO->prepare("SELECT * FROM $tb_name WHERE $where");
$this -> PDO -> beginTransaction();
$sth->execute( $data ); $sth->execute( $data );
$this -> PDO -> commit();
} }
catch( Exception $e ) catch (Exception $e) {
{ throw $e; // new Exception( "error selection" );
$this -> PDO -> rollBack();
throw new Exception( "error selection" );
return false; return false;
} }
return $sth; return $sth;
@ -208,26 +200,23 @@ class DBLayer {
public function update( $tb_name, $data, $where ) { public function update( $tb_name, $data, $where ) {
$this->useDb(); $this->useDb();
$field_option_values = null; $field_option_values = null;
foreach ( $data as $key => $value ) foreach ( $data as $key => $value ) {
{
$field_option_values .= ",$key" . '=:' . $key; $field_option_values .= ",$key" . '=:' . $key;
} }
$field_option_values = ltrim( $field_option_values, ',' ); $field_option_values = ltrim( $field_option_values, ',' );
try { try {
$sth = $this -> PDO -> prepare( "UPDATE $tb_name SET $field_option_values WHERE $where " ); $sth = $this -> PDO -> prepare( "UPDATE $tb_name SET $field_option_values WHERE $where " );
foreach ( $data as $key => $value ) foreach ( $data as $key => $value ) {
{
$sth -> bindValue( ":$key", $value ); $sth -> bindValue( ":$key", $value );
} }
$this -> PDO -> beginTransaction(); $this -> PDO -> beginTransaction();
$sth -> execute(); $sth -> execute();
$this -> PDO -> commit(); $this -> PDO -> commit();
} }
catch ( Exception $e ) catch ( Exception $e ) {
{
$this->PDO->rollBack(); $this->PDO->rollBack();
throw new Exception( 'error in updating' ); throw $e; // new Exception( 'error in updating' );
return false; return false;
} }
return true; return true;
@ -279,7 +268,7 @@ class DBLayer {
} }
catch (Exception $e) { catch (Exception $e) {
$this->PDO->rollBack(); $this->PDO->rollBack();
throw new Exception( "error in deleting" ); throw $e; // new Exception( "error in deleting" );
} }
} }
} }

Write Preview
Loading…
Cancel
Save