Merge pull request #3 from liu21st/master

merge

Author: vus520

Extend/Driver/Db/DbPdo.class.php

@@ -83,12 +83,16 @@ public function free() {
      * 执行查询 返回数据集
      * @access public
      * @param string $str  sql指令
+     * @param array $bind 参数绑定
      * @return mixed
      */
-    public function query($str) {
+    public function query($str,$bind=array()) {
         $this->initConnect(false);
         if ( !$this->_linkID ) return false;
         $this->queryStr = $str;
+        if(!empty($bind)){
+            $this->queryStr     .=   '[ '.print_r($bind,true).' ]';
+        }        
         //释放前次的查询结果
         if ( !empty($this->PDOStatement) ) $this->free();
         N('db_query',1);
@@ -97,7 +101,7 @@ public function query($str) {
         $this->PDOStatement = $this->_linkID->prepare($str);
         if(false === $this->PDOStatement)
             throw_exception($this->error());
-        $result =   $this->PDOStatement->execute();
+        $result =   $this->PDOStatement->execute($bind);
         $this->debug();
         if ( false === $result ) {
             $this->error();
@@ -111,12 +115,16 @@ public function query($str) {
      * 执行语句
      * @access public
      * @param string $str  sql指令
+     * @param array $bind 参数绑定
      * @return integer
      */
-    public function execute($str) {
+    public function execute($str,$bind=array()) {
         $this->initConnect(true);
         if ( !$this->_linkID ) return false;
         $this->queryStr = $str;
+        if(!empty($bind)){
+            $this->queryStr     .=   '[ '.print_r($bind,true).' ]';
+        }        
         $flag = false;
         if($this->dbType == 'OCI')
         {
@@ -134,7 +142,7 @@ public function execute($str) {
         if(false === $this->PDOStatement) {
             throw_exception($this->error());
         }
-        $result	=	$this->PDOStatement->execute();
+        $result	=	$this->PDOStatement->execute($bind);
         $this->debug();
         if ( false === $result) {
             $this->error();
@@ -423,6 +431,27 @@ public function escapeString($str) {
         }
     }
 
+    /**
+     * value分析
+     * @access protected
+     * @param mixed $value
+     * @return string
+     */
+    protected function parseValue($value) {
+        if(is_string($value)) {
+            $value =  strpos($value,':') === 0 ? $this->escapeString($value) : '\''.$this->escapeString($value).'\'';
+        }elseif(isset($value[0]) && is_string($value[0]) && strtolower($value[0]) == 'exp'){
+            $value =  $this->escapeString($value[1]);
+        }elseif(is_array($value)) {
+            $value =  array_map(array($this, 'parseValue'),$value);
+        }elseif(is_bool($value)){
+            $value =  $value ? '1' : '0';
+        }elseif(is_null($value)){
+            $value =  'null';
+        }
+        return $value;
+    }
+
     /**
      * 获取最后插入id
      * @access public