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

改进软删除

Browse Source
This commit is contained in:
thinkphp
2017-02-18 21:33:00 +08:00
parent 855124a514
commit f00825a477
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,10 +36,11 @@ class Mysql extends Builder
$key = 'json_extract(' . $field . ', \'$.' . $name . '\')'; $key = 'json_extract(' . $field . ', \'$.' . $name . '\')';
} elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) { } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
list($table, $key) = explode('.', $key, 2); list($table, $key) = explode('.', $key, 2);
if ('__TABLE__' == $table) {
$table = $this->query->getTable();
}
if (isset($options['alias'][$table])) { if (isset($options['alias'][$table])) {
$table = $options['alias'][$table]; $table = $options['alias'][$table];
} elseif ('__TABLE__' == $table) {
$table = $this->query->getTable();
} }
} }
if (!preg_match('/[,\'\"\*\(\)`.\s]/', $key)) { if (!preg_match('/[,\'\"\*\(\)`.\s]/', $key)) {

5
library/think/db/builder/Pgsql.php
View File

@@ -55,10 +55,11 @@ class Pgsql extends Builder
$key = $field . '->>\'' . $name . '\''; $key = $field . '->>\'' . $name . '\'';
} elseif (strpos($key, '.')) { } elseif (strpos($key, '.')) {
list($table, $key) = explode('.', $key, 2); list($table, $key) = explode('.', $key, 2);
if ('__TABLE__' == $table) {
$table = $this->query->getTable();
}
if (isset($options['alias'][$table])) { if (isset($options['alias'][$table])) {
$table = $options['alias'][$table]; $table = $options['alias'][$table];
} elseif ('__TABLE__' == $table) {
$table = $this->query->getTable();
} }
} }
if (isset($table)) { if (isset($table)) {

5
library/think/db/builder/Sqlite.php
View File

@@ -60,10 +60,11 @@ class Sqlite extends Builder
$key = trim($key); $key = trim($key);
if (strpos($key, '.')) { if (strpos($key, '.')) {
list($table, $key) = explode('.', $key, 2); list($table, $key) = explode('.', $key, 2);
if ('__TABLE__' == $table) {
$table = $this->query->getTable();
}
if (isset($options['alias'][$table])) { if (isset($options['alias'][$table])) {
$table = $options['alias'][$table]; $table = $options['alias'][$table];
} elseif ('__TABLE__' == $table) {
$table = $this->query->getTable();
} }
} }
if (isset($table)) { if (isset($table)) {

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

@@ -73,10 +73,11 @@ class Sqlsrv extends Builder
$key = trim($key); $key = trim($key);
if (strpos($key, '.') && !preg_match('/[,\'\"\(\)\[\s]/', $key)) { if (strpos($key, '.') && !preg_match('/[,\'\"\(\)\[\s]/', $key)) {
list($table, $key) = explode('.', $key, 2); list($table, $key) = explode('.', $key, 2);
if ('__TABLE__' == $table) {
$table = $this->query->getTable();
}
if (isset($options['alias'][$table])) { if (isset($options['alias'][$table])) {
$table = $options['alias'][$table]; $table = $options['alias'][$table];
} elseif ('__TABLE__' == $table) {
$table = $this->query->getTable();
} }
} }
if (!is_numeric($key) && !preg_match('/[,\'\"\*\(\)\[.\s]/', $key)) { if (!is_numeric($key) && !preg_match('/[,\'\"\*\(\)\[.\s]/', $key)) {