From 3a77fd3a23b38ebe2e4ba321620462378116e545 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 25 Mar 2013 11:36:23 +0800
Subject: [PATCH] =?UTF-8?q?Think\Db\Driver=E7=B1=BB=20=E5=88=A0=E9=99=A4qu?=
 =?UTF-8?q?eryID=E5=B1=9E=E6=80=A7=20oracle=E9=A9=B1=E5=8A=A8=E7=B1=BB=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0parseLock=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Think/Db/Driver.php        |  6 ++----
 Think/Db/Driver/Oracle.php | 10 ++++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Think/Db/Driver.php b/Think/Db/Driver.php
index 63212cbc..c9acf873 100644
--- a/Think/Db/Driver.php
+++ b/Think/Db/Driver.php
@@ -36,8 +36,6 @@ class Driver {
     protected $linkID     = [];
     // 当前连接ID
     protected $_linkID    = null;
-    // 当前查询ID
-    protected $queryID    = null;
     // 数据库连接参数配置
     protected $config     = [];
     // 数据库表达式
@@ -255,7 +253,7 @@ class Driver {
     public function error() {
         if($this->PDOStatement) {
             $error = $this->PDOStatement->errorInfo();
-            $this->error = $error[2];
+            $this->error = $error[1].':'.$error[2];
         }else{
             $this->error = '';
         }
@@ -934,7 +932,7 @@ class Driver {
      */
     public function __destruct() {
         // 释放查询
-        if ($this->queryID){
+        if ($this->PDOStatement){
             $this->free();
         }
         // 关闭连接
diff --git a/Think/Db/Driver/Oracle.php b/Think/Db/Driver/Oracle.php
index 7dbbcb92..e3661e16 100644
--- a/Think/Db/Driver/Oracle.php
+++ b/Think/Db/Driver/Oracle.php
@@ -157,4 +157,14 @@ class Oracle extends Driver{
         }
         return $limitStr?' WHERE '.$limitStr:'';
     }
+
+    /**
+     * 设置锁机制
+     * @access protected
+     * @return string
+     */
+    protected function parseLock($lock=false) {
+        if(!$lock) return '';
+        return ' FOR UPDATE NOWAIT ';
+    }
 }
\ No newline at end of file