From 54c90d0102515ad58a882a6b3f4ac623fc9d50ed Mon Sep 17 00:00:00 2001
From: wei <>
Date: Sat, 31 Mar 2007 06:42:15 +0000
Subject: Add changes by ezar for IBM Db2 Active Record support.

---
 .../ActiveRecord/Vendor/TIbmColumnMetaData.php     | 10 ++++++-
 .../Data/ActiveRecord/Vendor/TIbmMetaData.php      | 33 ++++++++++++++++++++++
 .../ActiveRecord/Vendor/TIbmMetaDataInspector.php  |  4 +--
 3 files changed, 44 insertions(+), 3 deletions(-)

(limited to 'framework/Data/ActiveRecord/Vendor')

diff --git a/framework/Data/ActiveRecord/Vendor/TIbmColumnMetaData.php b/framework/Data/ActiveRecord/Vendor/TIbmColumnMetaData.php
index 65e40a59..eafadae5 100644
--- a/framework/Data/ActiveRecord/Vendor/TIbmColumnMetaData.php
+++ b/framework/Data/ActiveRecord/Vendor/TIbmColumnMetaData.php
@@ -45,7 +45,7 @@ class TIbmColumnMetaData extends TComponent
 	 */
 	public function __construct($name,$type,$length,$notNull,$autoIncrement,$default,$primary)
 	{
-		$this->_property = $name;
+		$this->_property=$name;
 		$this->_name=$name;
 		$this->_type=$type;
 		$this->_length=$length;
@@ -63,6 +63,14 @@ class TIbmColumnMetaData extends TComponent
 		return $this->_name;
 	}
 
+	/**
+	 * @return integer length.
+	 */
+	public function getLength()
+	{
+		return $this->_length;
+	}
+
 	/**
 	 * @return string active record property name
 	 */
diff --git a/framework/Data/ActiveRecord/Vendor/TIbmMetaData.php b/framework/Data/ActiveRecord/Vendor/TIbmMetaData.php
index 4f923406..eeaea851 100644
--- a/framework/Data/ActiveRecord/Vendor/TIbmMetaData.php
+++ b/framework/Data/ActiveRecord/Vendor/TIbmMetaData.php
@@ -76,5 +76,38 @@ class TIbmMetaData extends TDbMetaDataCommon
 			$data[$k] = $this->postQueryRow($v);
 		return $data;
 	}
+	
+	public function getSearchRegExpCriteria($fields, $keywords)
+	{
+		if(strlen(trim($keywords)) == 0) return '';
+		$words = array();
+		preg_match_all('/([a-zA-Z0-9-+]+)/', $keywords, $words);
+		$result = array();
+		foreach($fields as $field)
+		{
+			$column = $this->getColumn($field);
+			if($this->isSearchableColumn($column))
+				$result[] = $this->getLikeCriteriaStr($column->getName(), $words[0]);
+		}
+			$a = '('.implode(' OR ', $result).')';
+			error_log($a);
+		return '('.implode(' OR ', $result).')';
+	}
+
+	protected function isSearchableColumn($column)
+	{
+		$type = strtolower($column->getType());
+		return $type === 'char' || $type === 'varchar';
+	}
+
+	protected function getLikeCriteriaStr($column, $words)
+	{
+		$result=array();
+		foreach($words as $word)
+			$result[] = "{$column} LIKE '%{$word}%'";
+		return '('.implode(' AND ', $result).')';
+	}
+
+	
 }
 ?>
\ No newline at end of file
diff --git a/framework/Data/ActiveRecord/Vendor/TIbmMetaDataInspector.php b/framework/Data/ActiveRecord/Vendor/TIbmMetaDataInspector.php
index 0ccc05ae..3920ac39 100644
--- a/framework/Data/ActiveRecord/Vendor/TIbmMetaDataInspector.php
+++ b/framework/Data/ActiveRecord/Vendor/TIbmMetaDataInspector.php
@@ -78,8 +78,8 @@ class TIbmMetaDataInspector extends TDbMetaDataInspector
 		$name = strtolower($col['COLNAME']);
 		$type = $col['TYPENAME'];
 		$length = $col['LENGTH'];
-		$notNull = $col['NULLS']==='N';
-		$autoIncrement=$col['IDENTITY']==='N';
+		$notNull = $col['NULLS']==='N'?1:0;
+		$autoIncrement=$col['IDENTITY']==='Y'?1:0;
 		$default = $col['DEFAULT'];
 		$primaryKey = $col['KEYSEQ']?1:0;
 		return new TIbmColumnMetaData($name,$type,$length,$notNull,$autoIncrement,$default,$primaryKey);
-- 
cgit v1.2.3