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

改进Connection类connect方法的异常处理 改进Query类一处可能的问题

Browse Source
This commit is contained in:
thinkphp
2016-08-11 14:00:24 +08:00
parent c19d404606
commit 5a612058ef
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/db/Connection.php
View File

@@ -286,7 +286,7 @@ abstract class Connection
Log::record($e->getMessage(), 'error'); Log::record($e->getMessage(), 'error');
return $this->connect($autoConnection, $linkNum); return $this->connect($autoConnection, $linkNum);
} else { } else {
throw new Exception($e->getMessage()); throw $e;
} }
} }
} }

8
library/think/db/Query.php
View File

@@ -747,7 +747,7 @@ class Query
} }
if (isset($this->options['field'])) { if (isset($this->options['field'])) {
$field = array_merge($this->options['field'], $field); $field = $this->options['field'] + $field;
} }
$this->options['field'] = $field; $this->options['field'] = $field;
return $this; return $this;
@@ -1415,8 +1415,10 @@ class Query
{ {
$types = $this->getFieldsType($options); $types = $this->getFieldsType($options);
$bind = []; $bind = [];
foreach ($types as $key => $type) { if ($types) {
$bind[$key] = $this->getFieldBindType($type); foreach ($types as $key => $type) {
$bind[$key] = $this->getFieldBindType($type);
}
} }
return $bind; return $bind;
} }