From c62bc8bca27d979f30f7217d53cd1057191af898 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 16 Apr 2016 15:07:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/builder/Oracle.php   | 2 +-
 library/think/db/builder/Sqlsrv.php   | 4 ++--
 library/think/db/connector/Mysql.php  | 2 +-
 library/think/db/connector/Oracle.php | 4 +---
 library/think/db/connector/Pgsql.php  | 3 +++
 library/think/db/connector/Sqlite.php | 3 +++
 library/think/db/connector/Sqlsrv.php | 4 +++-
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/library/think/db/builder/Oracle.php b/library/think/db/builder/Oracle.php
index 8843ad92..b8cfb804 100644
--- a/library/think/db/builder/Oracle.php
+++ b/library/think/db/builder/Oracle.php
@@ -41,11 +41,11 @@ class Oracle extends Builder
         }
         return $limitStr ? ' WHERE ' . $limitStr : '';
     }
+
     /**
      * 设置锁机制
      * @access protected
      * @param bool|false $lock
-     *
      * @return string
      */
     protected function parseLock($lock = false)
diff --git a/library/think/db/builder/Sqlsrv.php b/library/think/db/builder/Sqlsrv.php
index 8120fe0c..ef4a2e85 100644
--- a/library/think/db/builder/Sqlsrv.php
+++ b/library/think/db/builder/Sqlsrv.php
@@ -58,11 +58,11 @@ class Sqlsrv extends Builder
 
     /**
      * limit
-     * @access public
+     * @access protected
      * @param mixed $limit
      * @return string
      */
-    public function parseLimit($limit)
+    protected function parseLimit($limit)
     {
         if (empty($limit)) {
             return '';
diff --git a/library/think/db/connector/Mysql.php b/library/think/db/connector/Mysql.php
index 2a34f5d5..16272a94 100644
--- a/library/think/db/connector/Mysql.php
+++ b/library/think/db/connector/Mysql.php
@@ -43,7 +43,7 @@ class Mysql extends Connection
     /**
      * 取得数据表的字段信息
      * @access public
-     * @param $tableName
+     * @param string $tableName
      * @return array
      */
     public function getFields($tableName)
diff --git a/library/think/db/connector/Oracle.php b/library/think/db/connector/Oracle.php
index 542054bd..a521278f 100644
--- a/library/think/db/connector/Oracle.php
+++ b/library/think/db/connector/Oracle.php
@@ -96,9 +96,7 @@ class Oracle extends Connection
     /**
      * 取得数据表的字段信息
      * @access public
-     *
-     * @param $tableName
-     *
+     * @param string $tableName
      * @return array
      */
     public function getFields($tableName)
diff --git a/library/think/db/connector/Pgsql.php b/library/think/db/connector/Pgsql.php
index 43f02cec..5b376f9b 100644
--- a/library/think/db/connector/Pgsql.php
+++ b/library/think/db/connector/Pgsql.php
@@ -37,6 +37,7 @@ class Pgsql extends Connection
     /**
      * 取得数据表的字段信息
      * @access public
+     * @param string $tableName
      * @return array
      */
     public function getFields($tableName)
@@ -46,6 +47,7 @@ class Pgsql extends Connection
         $info            = [];
         if ($result) {
             foreach ($result as $key => $val) {
+                $val                 = array_change_key_case($val);
                 $info[$val['field']] = [
                     'name'    => $val['field'],
                     'type'    => $val['type'],
@@ -62,6 +64,7 @@ class Pgsql extends Connection
     /**
      * 取得数据库的表信息
      * @access public
+     * @param string $dbName
      * @return array
      */
     public function getTables($dbName = '')
diff --git a/library/think/db/connector/Sqlite.php b/library/think/db/connector/Sqlite.php
index 2602ab2c..f10883a0 100644
--- a/library/think/db/connector/Sqlite.php
+++ b/library/think/db/connector/Sqlite.php
@@ -34,6 +34,7 @@ class Sqlite extends Connection
     /**
      * 取得数据表的字段信息
      * @access public
+     * @param string $tableName
      * @return array
      */
     public function getFields($tableName)
@@ -43,6 +44,7 @@ class Sqlite extends Connection
         $info            = [];
         if ($result) {
             foreach ($result as $key => $val) {
+                $val                = array_change_key_case($val);
                 $info[$val['name']] = [
                     'name'    => $val['name'],
                     'type'    => $val['type'],
@@ -59,6 +61,7 @@ class Sqlite extends Connection
     /**
      * 取得数据库的表信息
      * @access public
+     * @param string $dbName
      * @return array
      */
     public function getTables($dbName = '')
diff --git a/library/think/db/connector/Sqlsrv.php b/library/think/db/connector/Sqlsrv.php
index a4b3463f..13063a52 100644
--- a/library/think/db/connector/Sqlsrv.php
+++ b/library/think/db/connector/Sqlsrv.php
@@ -19,7 +19,6 @@ use think\db\Connection;
  */
 class Sqlsrv extends Connection
 {
-    protected $selectSql = 'SELECT T1.* FROM (SELECT thinkphp.*, ROW_NUMBER() OVER (%ORDER%) AS ROW_NUMBER FROM (SELECT %DISTINCT% %FIELD% FROM %TABLE%%JOIN%%WHERE%%GROUP%%HAVING%) AS thinkphp) AS T1 %LIMIT%%COMMENT%';
     // PDO连接参数
     protected $options = [
         PDO::ATTR_CASE              => PDO::CASE_LOWER,
@@ -46,6 +45,7 @@ class Sqlsrv extends Connection
     /**
      * 取得数据表的字段信息
      * @access public
+     * @param string $tableName
      * @return array
      */
     public function getFields($tableName)
@@ -61,6 +61,7 @@ class Sqlsrv extends Connection
         $info = [];
         if ($result) {
             foreach ($result as $key => $val) {
+                $val                       = array_change_key_case($val);
                 $info[$val['column_name']] = [
                     'name'    => $val['column_name'],
                     'type'    => $val['data_type'],
@@ -77,6 +78,7 @@ class Sqlsrv extends Connection
     /**
      * 取得数据表的字段信息
      * @access public
+     * @param string $dbName
      * @return array
      */
     public function getTables($dbName = '')