RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Compiler issues fixed

Browse source
This commit is contained in:
doctrine 2006-08-07 22:40:06 +00:00
parent e3df7b6bd0
commit eb0eb44dbd
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Doctrine.php
View file

@ -395,6 +395,8 @@ final class Doctrine {
if(! self::$path) if(! self::$path)
self::$path = dirname(__FILE__); self::$path = dirname(__FILE__);
if(class_exists($classname))
return false;
$class = self::$path.DIRECTORY_SEPARATOR.str_replace("_",DIRECTORY_SEPARATOR,$classname).".php"; $class = self::$path.DIRECTORY_SEPARATOR.str_replace("_",DIRECTORY_SEPARATOR,$classname).".php";

10
Doctrine/DataDict.php
View file

@ -4,8 +4,12 @@ class Doctrine_DataDict {
private $dbh; private $dbh;
public function __construct(PDO $dbh) { public function __construct(PDO $dbh) {
$manager = Doctrine_Manager::getInstance(); $file = Doctrine::getPath().DIRECTORY_SEPARATOR."Doctrine".DIRECTORY_SEPARATOR."adodb-hack".DIRECTORY_SEPARATOR."adodb.inc.php";
require_once($manager->getRoot()."/adodb-hack/adodb.inc.php");
if( ! file_exists($file))
throw new Doctrine_Exception("Couldn't include datadict. File $file does not exist");
require_once($file);
$this->dbh = $dbh; $this->dbh = $dbh;
$this->dict = NewDataDictionary($dbh); $this->dict = NewDataDictionary($dbh);
@ -37,7 +41,7 @@ class Doctrine_DataDict {
$return = true; $return = true;
foreach($a as $sql) { foreach($a as $sql) {
try { try {
$this->dbh->query($sql); $this->dbh->query($sql);
} catch(Exception $e) { } catch(Exception $e) {
$return = $e; $return = $e;