mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善数据库驱动

Browse Source
This commit is contained in:
thinkphp
2016-04-16 15:07:29 +08:00
parent 6aa75b5d8a
commit c62bc8bca2
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/db/builder/Oracle.php
View File

@@ -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)

4
library/think/db/builder/Sqlsrv.php
View File

@@ -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 '';

2
library/think/db/connector/Mysql.php
View File

@@ -43,7 +43,7 @@ class Mysql extends Connection
/**
* 取得数据表的字段信息
* @access public
* @param $tableName
* @param string $tableName
* @return array
*/
public function getFields($tableName)

4
library/think/db/connector/Oracle.php
View File

@@ -96,9 +96,7 @@ class Oracle extends Connection
/**
* 取得数据表的字段信息
* @access public
*
* @param $tableName
*
* @param string $tableName
* @return array
*/
public function getFields($tableName)

3
library/think/db/connector/Pgsql.php
View File

@@ -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 = '')

3
library/think/db/connector/Sqlite.php
View File

@@ -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 = '')

4
library/think/db/connector/Sqlsrv.php
View File

@@ -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 = '')