summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php2
-rw-r--r--tests/simple_unit/ActiveRecord/CountRecordsTestCase.php6
2 files changed, 7 insertions, 1 deletions
diff --git a/framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php b/framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php
index 6e157785..826654dc 100644
--- a/framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php
+++ b/framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php
@@ -195,7 +195,7 @@ abstract class TDbMetaDataCommon extends TDbMetaData
*/
public function getDeleteByCriteriaCommand($conn, $criteria)
{
- $conditions = $criteria!==null?$this->getSqlFromCriteria($conn,$criteria) : '';
+ $conditions = $this->getSqlFromCriteria($conn,$criteria);
$table = $this->getTableName();
$sql = "DELETE FROM {$table} {$conditions}";
return $this->createCriteriaBindedCommand($conn,$sql, $criteria);
diff --git a/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php b/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php
index d9a98622..4d1cf51d 100644
--- a/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php
+++ b/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php
@@ -24,6 +24,12 @@ class CountRecordsTestCase extends UnitTestCase
$count = $finder->count('"order" > ?', 11);
$this->assertEqual($count,0);
}
+
+ function test_count_without_parameter()
+ {
+ $finder = DepartmentRecord::finder();
+ $this->assertEqual($finder->count(), 8);
+ }
}
?> \ No newline at end of file