Reverted changeset 2271, increase in memory usage too big
This commit is contained in:
parent
7bedb0b21d
commit
2d08773ea7
@ -88,11 +88,6 @@ class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
|
|||||||
$this->dbh->sqliteCreateFunction('mod', array('Doctrine_Expression_Sqlite', 'modImpl'), 2);
|
$this->dbh->sqliteCreateFunction('mod', array('Doctrine_Expression_Sqlite', 'modImpl'), 2);
|
||||||
$this->dbh->sqliteCreateFunction('concat', array('Doctrine_Expression_Sqlite', 'concatImpl'));
|
$this->dbh->sqliteCreateFunction('concat', array('Doctrine_Expression_Sqlite', 'concatImpl'));
|
||||||
$this->dbh->sqliteCreateFunction('md5', 'md5', 1);
|
$this->dbh->sqliteCreateFunction('md5', 'md5', 1);
|
||||||
$this->dbh->sqliteCreateFunction('sha1', 'sha1', 1);
|
|
||||||
$this->dbh->sqliteCreateFunction('locate', 'strpos', 2);
|
|
||||||
$this->dbh->sqliteCreateFunction('rtrim', 'rtrim', 1);
|
|
||||||
$this->dbh->sqliteCreateFunction('ltrim', 'ltrim', 1);
|
|
||||||
$this->dbh->sqliteCreateFunction('trim', 'trim', 1);
|
|
||||||
$this->dbh->sqliteCreateFunction('now', 'time', 0);
|
$this->dbh->sqliteCreateFunction('now', 'time', 0);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -132,6 +132,7 @@ class Doctrine_UnitTestCase extends UnitTestCase
|
|||||||
} catch(Doctrine_Manager_Exception $e) {
|
} catch(Doctrine_Manager_Exception $e) {
|
||||||
if($this->driverName == 'main') {
|
if($this->driverName == 'main') {
|
||||||
$this->dbh = new PDO('sqlite::memory:');
|
$this->dbh = new PDO('sqlite::memory:');
|
||||||
|
$this->dbh->sqliteCreateFunction('trim', 'trim', 1);
|
||||||
} else {
|
} else {
|
||||||
$this->dbh = $this->adapter = new Doctrine_Adapter_Mock($this->driverName);
|
$this->dbh = $this->adapter = new Doctrine_Adapter_Mock($this->driverName);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user