From 7ea61ba9701a04bc593d7c5960c5135ce39805a8 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Wed, 3 Jan 2007 11:31:18 +0000
Subject: quote the criteria string in ActiveRecord.

---
 framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php')

diff --git a/framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php b/framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php
index 44b33ab1..74c97689 100644
--- a/framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php
+++ b/framework/Data/ActiveRecord/Vendor/TDbMetaDataCommon.php
@@ -49,7 +49,7 @@ abstract class TDbMetaDataCommon extends TDbMetaData
 	public function getFindByCriteriaCommand($conn, $criteria=null)
 	{
 		$columns = $this->getSelectionColumns();
-		$conditions = $criteria!==null?$this->getSqlFromCriteria($criteria) : '';
+		$conditions = $criteria!==null?$this->getSqlFromCriteria($conn,$criteria) : '';
 		$table = $this->getTableName();
 		$sql = "SELECT {$columns} FROM {$table} {$conditions}";
 		return $this->createCriteriaBindedCommand($conn,$sql, $criteria);
@@ -64,13 +64,13 @@ abstract class TDbMetaDataCommon extends TDbMetaData
 	public function getCountRecordsCommand($conn, $criteria)
 	{
 		$columns = $this->getSelectionColumns();
-		$conditions = $this->getSqlFromCriteria($criteria);
+		$conditions = $this->getSqlFromCriteria($conn,$criteria);
 		$table = $this->getTableName();
 		$sql = "SELECT count(*) FROM {$table} {$conditions}";
 		return $this->createCriteriaBindedCommand($conn,$sql, $criteria);
 	}
 
-	abstract protected function getSqlFromCriteria(TActiveRecordCriteria $criteria);
+	abstract protected function getSqlFromCriteria($conn,TActiveRecordCriteria $criteria);
 
 	/**
 	 * Sql command with parameters binded.
-- 
cgit v1.2.3