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

规范调整

Browse Source
This commit is contained in:
thinkphp
2015-10-03 21:43:48 +08:00
parent 7c2bcbcff2
commit 1cfb3704c6
31 changed files with 393 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
traits/think/model/query.php
View File

@@ -52,12 +52,12 @@ trait Query {
public function parseSql($sql,$parse) {
// 分析表达式
if(true === $parse) {
$options = $this->_parseOptions();
$sql = $this->db->parseSql($sql,$options);
$options = $this->_parseOptions();
$sql = $this->db->parseSql($sql,$options);
}elseif(is_array($parse)){ // SQL预处理
$sql = vsprintf($sql,$parse);
$sql = vsprintf($sql,$parse);
}else{
$sql = strtr($sql,['__TABLE__'=>$this->getTableName(),'__PREFIX__'=>$this->tablePrefix]);
$sql = strtr($sql,['__TABLE__' => $this->getTableName(),'__PREFIX__' => $this->tablePrefix]);
}
return $sql;
}
@@ -70,7 +70,9 @@ trait Query {
* @return boolean
*/
public function patchQuery($sql=[]) {
if(!is_array($sql)) return false;
if(!is_array($sql)) {
return false;
}
// 自动启动事务支持
$this->startTrans();
try{
@@ -84,7 +86,7 @@ trait Query {
}
// 提交事务
$this->commit();
} catch (\Think\Exception $e) {
} catch (\think\exception $e) {
$this->rollback();
}
return true;