Skip to content

Commit

Permalink
Merge commit '2890e6659ecb6f315c82253e6985ece0e6dc489d' into 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ceeram committed Nov 12, 2011
2 parents 92688e2 + 2890e66 commit d8194a5
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/Cake/Model/Datasource/DboSource.php
Expand Up @@ -440,7 +440,9 @@ protected function _execute($sql, $params = array(), $prepareOptions = array())
}
if (!$query->columnCount()) {
$query->closeCursor();
return true;
if (!$query->rowCount()) {
return true;
}
}
return $query;
} catch (PDOException $e) {
Expand Down
24 changes: 24 additions & 0 deletions lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
Expand Up @@ -223,6 +223,30 @@ public function testTinyintCasting() {
$this->assertIdentical($result['Tinyint']['small_int'], '0');
$this->model->deleteAll(true);

$this->Dbo->rawQuery('DROP TABLE ' . $this->Dbo->fullTableName($tableName));
}
/**
* testLastAffected method
*
*
* @return void
*/
public function testLastAffected() {
$this->Dbo->cacheSources = false;
$tableName = 'tinyint_' . uniqid();
$this->Dbo->rawQuery('CREATE TABLE ' . $this->Dbo->fullTableName($tableName) . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id));');

$this->model = new CakeTestModel(array(
'name' => 'Tinyint', 'table' => $tableName, 'ds' => 'test'
));

$this->assertTrue((bool)$this->model->save(array('bool' => 5, 'small_int' => 5)));
$this->assertEqual(1, $this->model->find('count'));
$this->model->deleteAll(true);
$result = $this->Dbo->lastAffected();
$this->assertEqual(1, $result);
$this->assertEqual(0, $this->model->find('count'));

$this->Dbo->rawQuery('DROP TABLE ' . $this->Dbo->fullTableName($tableName));
}

Expand Down

0 comments on commit d8194a5

Please sign in to comment.