diff options
| author | wei <> | 2007-01-03 11:31:18 +0000 |
|---|---|---|
| committer | wei <> | 2007-01-03 11:31:18 +0000 |
| commit | 7ea61ba9701a04bc593d7c5960c5135ce39805a8 (patch) | |
| tree | 55cc29fdd679440bfb7a86d12aecca684dc6dbb0 /framework/Data/ActiveRecord/Vendor/TMysqlMetaData.php | |
| parent | 46484d91f49721a10b76e2c25071ad594f0b32d4 (diff) | |
quote the criteria string in ActiveRecord.
Diffstat (limited to 'framework/Data/ActiveRecord/Vendor/TMysqlMetaData.php')
| -rw-r--r-- | framework/Data/ActiveRecord/Vendor/TMysqlMetaData.php | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/framework/Data/ActiveRecord/Vendor/TMysqlMetaData.php b/framework/Data/ActiveRecord/Vendor/TMysqlMetaData.php index 1289afa5..0ac3798d 100644 --- a/framework/Data/ActiveRecord/Vendor/TMysqlMetaData.php +++ b/framework/Data/ActiveRecord/Vendor/TMysqlMetaData.php @@ -24,27 +24,36 @@ class TMysqlMetaData extends TDbMetaDataCommon {
/**
* Build the SQL search string from the criteria object for Postgress database.
+ * @param TDbConnection database connection.
* @param TActiveRecordCriteria search criteria.
* @return string SQL search.
*/
- protected function getSqlFromCriteria(TActiveRecordCriteria $criteria)
+ protected function getSqlFromCriteria($conn, TActiveRecordCriteria $criteria)
{
$sql = '';
if(($condition = $criteria->getCondition())!==null)
$sql .= $condition;
$orders=array();
foreach($criteria->getOrdersBy() as $by=>$ordering)
- $orders[] = $by.' '.$ordering;
+ $orders[] = $conn->quoteString($by).' '.$this->getOrdering($ordering);
if(count($orders) > 0)
$sql .= ' ORDER BY '.implode(', ', $orders);
if(($limit = $criteria->getLimit())!==null)
{
$offset = $criteria->getOffset();
- $offset = $offset===null?0:$offset;
- $sql .= ' LIMIT '.$offset.', '.$limit;
+ $offset = $offset===null?0:intval($offset); //assumes integer offset
+ $sql .= ' LIMIT '.$offset.', '.intval($limit); //assumes integer limit
}
return strlen($sql) > 0 ? ' WHERE '.$sql : '';
}
+
+ private function getOrdering($direction)
+ {
+ if(strtolower($direction)=='desc')
+ return 'DESC';
+ else
+ return 'ASC';
+ }
}
?>
\ No newline at end of file |