From c211d0859e59ba1ef02bf660c714b0333d8f8c43 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 14 Feb 2016 10:40:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9Boracle=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/driver/Oracle.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/think/db/driver/Oracle.php b/library/think/db/driver/Oracle.php
index 13a5cad6..015f23f2 100644
--- a/library/think/db/driver/Oracle.php
+++ b/library/think/db/driver/Oracle.php
@@ -32,7 +32,12 @@ class Oracle extends Driver
      */
     protected function parseDsn($config)
     {
-        $dsn = 'oci:dbname=' . $config['database'];
+        $dsn = 'oci:dbname=';
+        if (!empty($config['hostname'])) {
+            //  Oracle Instant Client
+            $dsn .= '//' . $config['hostname'] . ($config['hostport'] ? ':' . $config['hostport'] : '') . '/';
+        }
+        $dsn .= $config['database'];
         if (!empty($config['charset'])) {
             $dsn .= ';charset=' . $config['charset'];
         }