molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

内核更新，多余文件清理

Browse Source
This commit is contained in:
molong
2016-07-01 18:04:46 +08:00
parent a595f3a13e
commit 0398e5bd80
31 changed files with 426 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/library/think/db/connector/Oracle.php
View File

@@ -47,7 +47,7 @@ class Oracle extends Connection
* @param string $sql sql指令
* @param array $bind 参数绑定
* @param boolean $getLastInsID 是否获取自增ID
* @param string $sequence 序列名
* @param string $sequence 序列名
* @return integer
* @throws \Exception
* @throws \think\Exception
@@ -60,16 +60,16 @@ class Oracle extends Connection
}
// 根据参数绑定组装最终的SQL语句
$this->queryStr = $this->getBindSql($sql, $bind);
$this->queryStr = $this->getRealSql($sql, $bind);
$flag = false;
if (preg_match("/^\s*(INSERT\s+INTO)\s+(\w+)\s+/i", $sql, $match)) {
if(is_null($sequence)){
if (is_null($sequence)) {
$sequence = Config::get("db_sequence_prefix") . str_ireplace(Config::get("database.prefix"), "", $match[2]);
}
$flag = (boolean) $this->query("SELECT * FROM all_sequences WHERE sequence_name='" . strtoupper($sequence) . "'");
$flag = (boolean) $this->query("SELECT * FROM all_sequences WHERE sequence_name='" . strtoupper($sequence) . "'");
}
//释放前次的查询结果
if (!empty($this->PDOStatement)) {
$this->free();
@@ -89,7 +89,7 @@ class Oracle extends Connection
$this->lastInsID = $this->linkID->lastInsertId();
if ($getLastInsID) {
return $this->lastInsID;
}
}
}
return $this->numRows;
} catch (\PDOException $e) {
@@ -130,7 +130,7 @@ class Oracle extends Connection
/**
* 取得数据库的表信息（暂时实现取得用户表信息）
* @access public
* @param string $dbName
* @param string $dbName
* @return array
*/
public function getTables($dbName = '')
@@ -155,7 +155,8 @@ class Oracle extends Connection
return [];
}
protected function supportSavepoint(){
protected function supportSavepoint()
{
return true;
}
}