From fd4b8d9f45d1707035021bc19b8d5bc17ede66ce Mon Sep 17 00:00:00 2001
From: wei <>
Date: Mon, 12 Feb 2007 12:46:11 +0000
Subject: Add IBM DB2 driver for active record.

---
 framework/Data/ActiveRecord/TActiveRecord.php | 46 +++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 7 deletions(-)

(limited to 'framework/Data/ActiveRecord/TActiveRecord.php')

diff --git a/framework/Data/ActiveRecord/TActiveRecord.php b/framework/Data/ActiveRecord/TActiveRecord.php
index 91ae971a..bdb03596 100644
--- a/framework/Data/ActiveRecord/TActiveRecord.php
+++ b/framework/Data/ActiveRecord/TActiveRecord.php
@@ -384,6 +384,8 @@ abstract class TActiveRecord extends TComponent
 
 	/**
 	 * Find records using full SQL, returns corresponding record object.
+	 * The names of the column retrieved must be defined in your Active Record
+	 * class.
 	 * @param string select SQL
 	 * @param array $parameters
 	 * @return array matching active records.
@@ -439,8 +441,8 @@ abstract class TActiveRecord extends TComponent
 	 * $finder->find('Name = ?', $name);
 	 * </code>
 	 * <code>
-	 * $finder->findByUsernameAndPassword($name,$pass);
-	 * $finder->findBy_Username_And_Password($name,$pass);
+	 * $finder->findByUsernameAndPassword($name,$pass); // OR may be used
+	 * $finder->findBy_Username_And_Password($name,$pass); // _OR_ may be used
 	 * $finder->find('Username = ? AND Password = ?', $name, $pass);
 	 * </code>
 	 * <code>
@@ -481,13 +483,43 @@ abstract class TActiveRecord extends TComponent
 	 */
 	private function createCriteriaFromString($method, $condition, $args)
 	{
-		$fields = array();
-		foreach(preg_split('/and|_and_/i',$condition) as $field)
-			$fields[] = $field.' = ?';
+		$fields = $this->extractMatchingConditions($method, $condition);
 		$args=count($args) === 1 && is_array($args[0]) ? $args[0] : $args;
 		if(count($fields)>count($args))
-			throw new TActiveRecordException('ar_mismatch_args_exception',$method,count($fields),count($args));
-		return new TActiveRecordCriteria(implode(' AND ',$fields),$args);
+		{
+			throw new TActiveRecordException('ar_mismatch_args_exception',
+				$method,count($fields),count($args));
+		}
+		return new TActiveRecordCriteria(implode(' ',$fields),$args);
+	}
+
+	/**
+	 * Calculates the AND/OR condition from dynamic method substrings using
+	 * table meta data, allows for any AND-OR combinations.
+	 * @param string dynamic method name
+	 * @param string dynamic method search criteria
+	 * @return array search condition substrings
+	 */
+	private function extractMatchingConditions($method, $condition)
+	{
+		$meta = $this->getRecordManager()->getRecordGateway()->getMetaData($this);
+		$search = implode('|', $meta->getColumnNames());
+		$regexp = '/('.$search.')(and|_and_|or|_or_)?/i';
+		$matches = array();
+		if(!preg_match_all($regexp, strtolower($condition), $matches,PREG_SET_ORDER))
+		{
+			throw new TActiveRecordException('ar_mismatch_column_names',
+				$method, implode(', ', $meta->getColumnNames()), $meta->getTableName());
+		}
+		$fields = array();
+		foreach($matches as $match)
+		{
+			$sql = $meta->getColumn($match[1])->getName() . ' = ? ';
+			if(count($match) > 2)
+				$sql .= strtoupper(str_replace('_', '', $match[2]));
+			$fields[] = $sql;
+		}
+		return $fields;
 	}
 }
 ?>
\ No newline at end of file
-- 
cgit v1.2.3