PSR规范调整

This commit is contained in:
thinkphp
2015-10-04 13:05:15 +08:00
parent 1cfb3704c6
commit 27e724bb3c
135 changed files with 9426 additions and 11556 deletions

View File

@@ -10,15 +10,17 @@
// +----------------------------------------------------------------------
namespace think\db\driver;
use think\db\Driver;
/**
* Oracle数据库驱动
*/
class Oracle extends Driver{
class Oracle extends Driver
{
private $table = '';
protected $selectSql = 'SELECT * FROM (SELECT thinkphp.*, rownum AS numrow FROM (SELECT %DISTINCT% %FIELD% FROM %TABLE%%JOIN%%WHERE%%GROUP%%HAVING%%ORDER%) thinkphp ) %LIMIT%%COMMENT%';
private $table = '';
protected $selectSql = 'SELECT * FROM (SELECT thinkphp.*, rownum AS numrow FROM (SELECT %DISTINCT% %FIELD% FROM %TABLE%%JOIN%%WHERE%%GROUP%%HAVING%%ORDER%) thinkphp ) %LIMIT%%COMMENT%';
/**
* 解析pdo连接的dsn信息
@@ -26,10 +28,11 @@ class Oracle extends Driver{
* @param array $config 连接信息
* @return string
*/
protected function parseDsn($config){
$dsn = 'oci:dbname='.$config['database'];
if(!empty($config['charset'])) {
$dsn .= ';charset='.$config['charset'];
protected function parseDsn($config)
{
$dsn = 'oci:dbname=' . $config['database'];
if (!empty($config['charset'])) {
$dsn .= ';charset=' . $config['charset'];
}
return $dsn;
}
@@ -40,42 +43,49 @@ class Oracle extends Driver{
* @param string $str sql指令
* @return integer
*/
public function execute($str,$bind=[]) {
public function execute($str, $bind = [])
{
$this->initConnect(true);
if ( !$this->_linkID ) return false;
if (!$this->_linkID) {
return false;
}
$this->queryStr = $str;
if(!empty($bind)){
$this->queryStr .= '[ '.print_r($bind,true).' ]';
}
if (!empty($bind)) {
$this->queryStr .= '[ ' . print_r($bind, true) . ' ]';
}
$flag = false;
if(preg_match("/^\s*(INSERT\s+INTO)\s+(\w+)\s+/i", $str, $match)) {
$this->table = C("DB_SEQUENCE_PREFIX").str_ireplace(C("DB_PREFIX"), "", $match[2]);
$flag = (boolean)$this->query("SELECT * FROM user_sequences WHERE sequence_name='" . strtoupper($this->table) . "'");
if (preg_match("/^\s*(INSERT\s+INTO)\s+(\w+)\s+/i", $str, $match)) {
$this->table = C("DB_SEQUENCE_PREFIX") . str_ireplace(C("DB_PREFIX"), "", $match[2]);
$flag = (boolean) $this->query("SELECT * FROM user_sequences WHERE sequence_name='" . strtoupper($this->table) . "'");
}
//释放前次的查询结果
if ( !empty($this->PDOStatement) ) $this->free();
if (!empty($this->PDOStatement)) {
$this->free();
}
$this->executeTimes++;
// 记录开始执行时间
$this->debug(true);
$this->PDOStatement = $this->_linkID->prepare($str);
if(false === $this->PDOStatement) {
$this->PDOStatement = $this->_linkID->prepare($str);
if (false === $this->PDOStatement) {
$this->error();
return false;
}
try{
$result = $this->PDOStatement->execute($bind);
try {
$result = $this->PDOStatement->execute($bind);
$this->debug(false);
if ( false === $result) {
if (false === $result) {
$this->error();
return false;
} else {
$this->numRows = $this->PDOStatement->rowCount();
if($flag || preg_match("/^\s*(INSERT\s+INTO|REPLACE\s+INTO)\s+/i", $str)) {
if ($flag || preg_match("/^\s*(INSERT\s+INTO|REPLACE\s+INTO)\s+/i", $str)) {
$this->lastInsID = $this->_linkID->lastInsertId();
}
return $this->numRows;
}
}catch (\PDOException $e) {
} catch (\PDOException $e) {
$this->error();
return false;
}
@@ -85,14 +95,15 @@ class Oracle extends Driver{
* 取得数据表的字段信息
* @access public
*/
public function getFields($tableName) {
public function getFields($tableName)
{
list($tableName) = explode(' ', $tableName);
$result = $this->query("select a.column_name,data_type,decode(nullable,'Y',0,1) notnull,data_default,decode(a.column_name,b.column_name,1,0) pk "
."from user_tab_columns a,(select column_name from user_constraints c,user_cons_columns col "
."where c.constraint_name=col.constraint_name and c.constraint_type='P'and c.table_name='".strtoupper($tableName)
."') b where table_name='".strtoupper($tableName)."' and a.column_name=b.column_name(+)");
$info = [];
if($result) {
$result = $this->query("select a.column_name,data_type,decode(nullable,'Y',0,1) notnull,data_default,decode(a.column_name,b.column_name,1,0) pk "
. "from user_tab_columns a,(select column_name from user_constraints c,user_cons_columns col "
. "where c.constraint_name=col.constraint_name and c.constraint_type='P'and c.table_name='" . strtoupper($tableName)
. "') b where table_name='" . strtoupper($tableName) . "' and a.column_name=b.column_name(+)");
$info = [];
if ($result) {
foreach ($result as $key => $val) {
$info[strtolower($val['column_name'])] = [
'name' => strtolower($val['column_name']),
@@ -111,9 +122,10 @@ class Oracle extends Driver{
* 取得数据库的表信息(暂时实现取得用户表信息)
* @access public
*/
public function getTables($dbName='') {
public function getTables($dbName = '')
{
$result = $this->query("select table_name from user_tables");
$info = [];
$info = [];
foreach ($result as $key => $val) {
$info[$key] = current($val);
}
@@ -126,7 +138,8 @@ class Oracle extends Driver{
* @param string $str SQL指令
* @return string
*/
public function escapeString($str) {
public function escapeString($str)
{
return str_ireplace("'", "''", $str);
}
@@ -135,16 +148,19 @@ class Oracle extends Driver{
* @access public
* @return string
*/
public function parseLimit($limit) {
$limitStr = '';
if(!empty($limit)) {
$limit = explode(',',$limit);
if(count($limit)>1)
$limitStr = "(numrow>" . $limit[0] . ") AND (numrow<=" . ($limit[0]+$limit[1]) . ")";
else
$limitStr = "(numrow>0 AND numrow<=".$limit[0].")";
public function parseLimit($limit)
{
$limitStr = '';
if (!empty($limit)) {
$limit = explode(',', $limit);
if (count($limit) > 1) {
$limitStr = "(numrow>" . $limit[0] . ") AND (numrow<=" . ($limit[0] + $limit[1]) . ")";
} else {
$limitStr = "(numrow>0 AND numrow<=" . $limit[0] . ")";
}
}
return $limitStr?' WHERE '.$limitStr:'';
return $limitStr ? ' WHERE ' . $limitStr : '';
}
/**
@@ -152,8 +168,12 @@ class Oracle extends Driver{
* @access protected
* @return string
*/
protected function parseLock($lock=false) {
if(!$lock) return '';
protected function parseLock($lock = false)
{
if (!$lock) {
return '';
}
return ' FOR UPDATE NOWAIT ';
}
}