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

改进一处mysql兼容性问题

Browse Source
This commit is contained in:
thinkphp
2018-04-13 11:33:30 +08:00
parent 427bf4b2df
commit e4d4911b46
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/db/builder/Mysql.php
View File

@@ -105,7 +105,8 @@ class Mysql extends Builder
$table = $options['alias'][$table];
}
}
if ($strict || !preg_match('/[,\'\"\*\(\)`.\s]/', $key)) {
if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)`.\s]/', $key))) {
$key = '`' . $key . '`';
}
if (isset($table)) {

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

@@ -92,7 +92,7 @@ class Sqlsrv extends Builder
$table = $options['alias'][$table];
}
}
if ($strict || !preg_match('/[,\'\"\*\(\)\[.\s]/', $key)) {
if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)\[.\s]/', $key))) {
$key = '[' . $key . ']';
}
if (isset($table)) {