adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Freeing up some memory in dbos after the result set has been completly fetched.

Browse source 
Adding dbo_mysql and dbo_postgres to the AllDAtabase testsuite
This commit is contained in:
José Lorenzo Rodríguez 2010-11-16 23:59:24 -04:30
parent c0f10437ea
commit 40418de218
6 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/libs/model/datasources/dbo/dbo_mysql.php
View file

@ -187,6 +187,7 @@ class DboMysql extends DboSource {
$result = $this->_execute('SHOW TABLES FROM ' . $this->config['database']);
if (!$result) {
$result->closeCursor();
return array();
} else {
$tables = array();
@ -194,6 +195,8 @@ class DboMysql extends DboSource {
while ($line = $result->fetch()) {
$tables[] = $line[0];
}
$result->closeCursor();
parent::listSources($tables);
return $tables;
}
@ -245,6 +248,7 @@ class DboMysql extends DboSource {
}
return $resultRow;
} else {
$this->_result->closeCursor();
return false;
}
}
@ -322,6 +326,7 @@ class DboMysql extends DboSource {
}
}
$this->__cacheDescription($this->fullTableName($model, false), $fields);
$cols->closeCursor();
return $fields;
}
@ -437,6 +442,7 @@ class DboMysql extends DboSource {
$index[$idx->Key_name]['column'] = $col;
}
}
$indices->closeCursor();
}
return $index;
}
@ -596,6 +602,7 @@ class DboMysql extends DboSource {
$result = $this->_execute('SHOW TABLE STATUS ' . $condition, $params);
if (!$result) {
$result->closeCursor();
return array();
} else {
$tables = array();
@ -609,6 +616,7 @@ class DboMysql extends DboSource {
}
}
}
$result->closeCursor();
if (is_string($name)) {
return $tables[$name];
}

5
cake/libs/model/datasources/dbo/dbo_postgres.php
View file

@ -164,6 +164,7 @@ class DboPostgres extends DboSource {
$result = $this->_execute($sql, array($schema));
if (!$result) {
$result->closeCursor();
return array();
} else {
$tables = array();
@ -172,6 +173,7 @@ class DboPostgres extends DboSource {
$tables[] = $item->name;
}
$result->closeCursor();
parent::listSources($tables);
return $tables;
}
@ -247,6 +249,8 @@ class DboPostgres extends DboSource {
if (isset($model->sequence)) {
$this->_sequenceMap[$table][$model->primaryKey] = $model->sequence;
}
$cols->closeCursor();
return $fields;
}
@ -717,6 +721,7 @@ class DboPostgres extends DboSource {
}
return $resultRow;
} else {
$this->_result->closeCursor();
return false;
}
}

2
cake/libs/model/datasources/dbo_source.php
View file

@ -333,9 +333,11 @@ class DboSource extends DataSource {
if (!$query->execute($params)) {
$this->_results = $query;
$this->error = $this->lastError($query);
$query->closeCursor();
return false;
}
if (!$query->columnCount()) {
$query->closeCursor();
return true;
}
return $query;

9
cake/tests/cases/libs/all_database.test.php
View file

@ -38,7 +38,14 @@ class AllDatabaseTest extends PHPUnit_Framework_TestSuite {
$path = CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS;
$tasks = array('db_acl', 'cake_schema', 'connection_manager', 'datasources' . DS . 'dbo_source');
$tasks = array(
'db_acl',
'cake_schema',
'connection_manager',
'datasources' . DS . 'dbo_source',
'datasources' . DS . 'dbo' . DS . 'dbo_mysql',
'datasources' . DS . 'dbo' . DS . 'dbo_postgres'
);
foreach ($tasks as $task) {
$suite->addTestFile($path . $task . '.test.php');
}

1
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
View file

@ -62,6 +62,7 @@ class DboMysqlTest extends CakeTestCase {
*/
public function setUp() {
$this->Dbo = ConnectionManager::getDataSource('test');
$this->skipIf(!($this->Dbo instanceof DboMysql));
if ($this->Dbo->config['driver'] !== 'mysql') {
$this->markTestSkipped('The MySQL extension is not available.');
}

1
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
View file

@ -244,6 +244,7 @@ class DboPostgresTest extends CakeTestCase {
public function setUp() {
Configure::write('Cache.disable', true);
$this->Dbo = ConnectionManager::getDataSource('test');
$this->skipIf(!($this->Dbo instanceof DboPostgres));
$this->Dbo2 = new DboPostgresTestDb($this->Dbo->config, false);
$this->skipUnless($this->Dbo->config['driver'] == 'postgres', 'PostgreSQL connection not available');
$this->model = new PostgresTestModel();