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 traits\think\model;
define('EXISTS_VALIDATE',0);
define('MUST_VALIDATE',1);
define('VALUE_VALIDATE',2);
trait Auto {
define('EXISTS_VALIDATE', 0);
define('MUST_VALIDATE', 1);
define('VALUE_VALIDATE', 2);
trait Auto
{
protected $validate = []; // 自动验证定义
protected $auto = []; // 自动完成定义
protected $validate = []; // 自动验证定义
protected $auto = []; // 自动完成定义
/**
* 创建数据对象 但不保存到数据库
* @access public
@@ -26,65 +28,72 @@ trait Auto {
* @param string $type 状态
* @return mixed
*/
public function create($data='',$type='') {
public function create($data = '', $type = '')
{
// 如果没有传值默认取POST数据
if(empty($data)) {
$data = $_POST;
}elseif(is_object($data)){
$data = get_object_vars($data);
if (empty($data)) {
$data = $_POST;
} elseif (is_object($data)) {
$data = get_object_vars($data);
}
// 验证数据
if(empty($data) || !is_array($data)) {
if (empty($data) || !is_array($data)) {
$this->error = \think\Lang::get('_DATA_TYPE_INVALID_');
return false;
}
// 状态
$type = $type?$type:(!empty($data[$this->getPk()])?self::MODEL_UPDATE:self::MODEL_INSERT);
$type = $type ? $type : (!empty($data[$this->getPk()]) ? self::MODEL_UPDATE : self::MODEL_INSERT);
// 检测提交字段的合法性
if(isset($this->options['field'])) { // $this->field('field1,field2...')->create()
$fields = $this->options['field'];
if (isset($this->options['field'])) {
// $this->field('field1,field2...')->create()
$fields = $this->options['field'];
unset($this->options['field']);
}elseif($type == self::MODEL_INSERT && isset($this->insertFields)) {
$fields = $this->insertFields;
}elseif($type == self::MODEL_UPDATE && isset($this->updateFields)) {
$fields = $this->updateFields;
} elseif (self::MODEL_INSERT == $type && isset($this->insertFields)) {
$fields = $this->insertFields;
} elseif (self::MODEL_UPDATE == $type && isset($this->updateFields)) {
$fields = $this->updateFields;
}
if(isset($fields)) {
if(is_string($fields)) {
$fields = explode(',',$fields);
if (isset($fields)) {
if (is_string($fields)) {
$fields = explode(',', $fields);
}
// 判断令牌验证字段
if(C('TOKEN_ON')) $fields[] = C('TOKEN_NAME');
foreach ($data as $key=>$val){
if(!in_array($key,$fields)) {
if (C('TOKEN_ON')) {
$fields[] = C('TOKEN_NAME');
}
foreach ($data as $key => $val) {
if (!in_array($key, $fields)) {
unset($data[$key]);
}
}
}
// 数据自动验证
if(!$this->autoValidation($data,$type)) return false;
if (!$this->autoValidation($data, $type)) {
return false;
}
// 验证完成生成数据对象
if($this->autoCheckFields) { // 开启字段检测 则过滤非法字段数据
$fields = $this->getDbFields();
foreach ($data as $key=>$val){
if(!in_array($key,$fields)) {
if ($this->autoCheckFields) {
// 开启字段检测 则过滤非法字段数据
$fields = $this->getDbFields();
foreach ($data as $key => $val) {
if (!in_array($key, $fields)) {
unset($data[$key]);
}
}
}
// 创建完成对数据进行自动处理
$this->autoOperation($data,$type);
$this->autoOperation($data, $type);
// 赋值当前数据对象
$this->data = $data;
$this->data = $data;
// 返回创建的数据以供其他调用
return $data;
}
}
/**
* 使用正则验证数据
@@ -93,23 +102,24 @@ trait Auto {
* @param string $rule 验证规则
* @return boolean
*/
public function regex($value,$rule) {
public function regex($value, $rule)
{
static $validate = [
'require' => '/.+/',
'email' => '/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/',
'url' => '/^http(s?):\/\/(?:[A-za-z0-9-]+\.)+[A-za-z]{2,4}(?:[\/\?#][\/=\?%\-&~`@[\]\':+!\.#\w]*)?$/',
'currency' => '/^\d+(\.\d+)?$/',
'number' => '/^\d+$/',
'zip' => '/^\d{6}$/',
'integer' => '/^[-\+]?\d+$/',
'double' => '/^[-\+]?\d+(\.\d+)?$/',
'english' => '/^[A-Za-z]+$/',
'require' => '/.+/',
'email' => '/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/',
'url' => '/^http(s?):\/\/(?:[A-za-z0-9-]+\.)+[A-za-z]{2,4}(?:[\/\?#][\/=\?%\-&~`@[\]\':+!\.#\w]*)?$/',
'currency' => '/^\d+(\.\d+)?$/',
'number' => '/^\d+$/',
'zip' => '/^\d{6}$/',
'integer' => '/^[-\+]?\d+$/',
'double' => '/^[-\+]?\d+(\.\d+)?$/',
'english' => '/^[A-Za-z]+$/',
];
// 检查是否有内置的正则表达式
if(isset($validate[strtolower($rule)])){
$rule = $validate[strtolower($rule)];
if (isset($validate[strtolower($rule)])) {
$rule = $validate[strtolower($rule)];
}
return preg_match($rule,$value)===1;
return preg_match($rule, $value) === 1;
}
/**
@@ -119,40 +129,41 @@ trait Auto {
* @param string $type 创建类型
* @return mixed
*/
private function autoOperation(&$data,$type) {
if(!empty($this->options['auto'])) {
$_auto = $this->options['auto'];
private function autoOperation(&$data, $type)
{
if (!empty($this->options['auto'])) {
$_auto = $this->options['auto'];
unset($this->options['auto']);
}elseif(!empty($this->auto)){
$_auto = $this->auto;
} elseif (!empty($this->auto)) {
$_auto = $this->auto;
}
// 自动填充
if(isset($_auto)) {
foreach ($_auto as $auto){
if (isset($_auto)) {
foreach ($_auto as $auto) {
// 填充因子定义格式
// ['field','填充内容','填充条件','附加规则',[额外参数]]
if(empty($auto[2])) {
if (empty($auto[2])) {
$auto[2] = self::MODEL_INSERT; // 默认为新增的时候自动填充
}
if( $type == $auto[2] || $auto[2] == self::MODEL_BOTH) {
switch(trim($auto[3])) {
case 'function': // 使用函数进行填充 字段的值作为参数
if ($type == $auto[2] || self::MODEL_BOTH == $auto[2]) {
switch (trim($auto[3])) {
case 'function': // 使用函数进行填充 字段的值作为参数
case 'callback': // 使用回调方法
$args = isset($auto[4])?(array)$auto[4]:[];
if(isset($data[$auto[0]])) {
array_unshift($args,$data[$auto[0]]);
$args = isset($auto[4]) ? (array) $auto[4] : [];
if (isset($data[$auto[0]])) {
array_unshift($args, $data[$auto[0]]);
}
if('function'==$auto[3]) {
$data[$auto[0]] = call_user_func_array($auto[1], $args);
}else{
$data[$auto[0]] = call_user_func_array([&$this,$auto[1]], $args);
if ('function' == $auto[3]) {
$data[$auto[0]] = call_user_func_array($auto[1], $args);
} else {
$data[$auto[0]] = call_user_func_array([ & $this, $auto[1]], $args);
}
break;
case 'field': // 用其它字段的值进行填充
case 'field': // 用其它字段的值进行填充
$data[$auto[0]] = $data[$auto[1]];
break;
case 'ignore': // 为空忽略
if(''===$data[$auto[0]]){
if ('' === $data[$auto[0]]) {
unset($data[$auto[0]]);
}
break;
@@ -160,7 +171,7 @@ trait Auto {
default: // 默认作为字符串填充
$data[$auto[0]] = $auto[1];
}
if(false === $data[$auto[0]] ) {
if (false === $data[$auto[0]]) {
unset($data[$auto[0]]);
}
}
@@ -176,49 +187,57 @@ trait Auto {
* @param string $type 创建类型
* @return boolean
*/
protected function autoValidation($data,$type) {
if(!empty($this->options['validate'])) {
$_validate = $this->options['validate'];
protected function autoValidation($data, $type)
{
if (!empty($this->options['validate'])) {
$_validate = $this->options['validate'];
unset($this->options['validate']);
}elseif(!empty($this->validate)){
$_validate = $this->validate;
} elseif (!empty($this->validate)) {
$_validate = $this->validate;
}
// 属性验证
if(isset($_validate)) { // 如果设置了数据自动验证则进行数据验证
if($this->patchValidate) { // 重置验证错误信息
if (isset($_validate)) {
// 如果设置了数据自动验证则进行数据验证
if ($this->patchValidate) {
// 重置验证错误信息
$this->error = [];
}
foreach($_validate as $key=>$val) {
foreach ($_validate as $key => $val) {
// 验证因子定义格式
// [field,rule,message,condition,type,when,params]
// 判断是否需要执行验证
if(empty($val[5]) || $val[5]== self::MODEL_BOTH || $val[5]== $type ) {
if(0==strpos($val[2],'{%') && strpos($val[2],'}')){
if (empty($val[5]) || self::MODEL_BOTH == $val[5] || $val[5] == $type) {
if (0 == strpos($val[2], '{%') && strpos($val[2], '}')) {
// 支持提示信息的多语言 使用 {%语言定义} 方式
$val[2] = L(substr($val[2],2,-1));
$val[2] = L(substr($val[2], 2, -1));
}
$val[3] = isset($val[3])?$val[3]:EXISTS_VALIDATE;
$val[4] = isset($val[4])?$val[4]:'regex';
$val[3] = isset($val[3]) ? $val[3] : EXISTS_VALIDATE;
$val[4] = isset($val[4]) ? $val[4] : 'regex';
// 判断验证条件
switch($val[3]) {
case MUST_VALIDATE: // 必须验证 不管表单是否有设置该字段
if(false === $this->_validationField($data,$val))
switch ($val[3]) {
case MUST_VALIDATE: // 必须验证 不管表单是否有设置该字段
if (false === $this->_validationField($data, $val)) {
return false;
}
break;
case VALUE_VALIDATE: // 值不为空的时候才验证
if('' != trim($data[$val[0]]))
if(false === $this->_validationField($data,$val))
case VALUE_VALIDATE: // 值不为空的时候才验证
if ('' != trim($data[$val[0]])) {
if (false === $this->_validationField($data, $val)) {
return false;
}
}
break;
default: // 默认表单存在该字段就验证
if(isset($data[$val[0]]) && false === $this->_validationField($data,$val)) {
default: // 默认表单存在该字段就验证
if (isset($data[$val[0]]) && false === $this->_validationField($data, $val)) {
return false;
}
}
}
}
// 批量验证的时候最后返回错误
if(!empty($this->error)) {
if (!empty($this->error)) {
return false;
}
}
@@ -233,16 +252,17 @@ trait Auto {
* @param array $val 验证因子
* @return boolean
*/
protected function _validationField($data,$val) {
if(false === $this->_validationFieldItem($data,$val)){
if($this->patchValidate) {
$this->error[$val[0]] = $val[2];
}else{
$this->error = $val[2];
protected function _validationField($data, $val)
{
if (false === $this->_validationFieldItem($data, $val)) {
if ($this->patchValidate) {
$this->error[$val[0]] = $val[2];
} else {
$this->error = $val[2];
return false;
}
}
return ;
return;
}
/**
@@ -252,45 +272,47 @@ trait Auto {
* @param array $val 验证因子
* @return boolean
*/
protected function _validationFieldItem($data,$val) {
switch(strtolower(trim($val[4]))) {
case 'function':// 使用函数进行验证
case 'callback':// 调用方法进行验证
$args = isset($val[6])?(array)$val[6]:[];
if(is_string($val[0]) && strpos($val[0], ',')){
protected function _validationFieldItem($data, $val)
{
switch (strtolower(trim($val[4]))) {
case 'function': // 使用函数进行验证
case 'callback': // 调用方法进行验证
$args = isset($val[6]) ? (array) $val[6] : [];
if (is_string($val[0]) && strpos($val[0], ',')) {
$val[0] = explode(',', $val[0]);
}
if(is_array($val[0])){
if (is_array($val[0])) {
// 支持多个字段验证
foreach($val[0] as $field){
foreach ($val[0] as $field) {
$_data[$field] = $data[$field];
}
array_unshift($args, $_data);
}else{
} else {
array_unshift($args, $data[$val[0]]);
}
return call_user_func_array( 'function'==$val[4] ? $val[1] : [&$this, $val[1]], $args);
return call_user_func_array('function' == $val[4] ? $val[1] : [ & $this, $val[1]], $args);
case 'confirm': // 验证两个字段是否相同
return $data[$val[0]] == $data[$val[1]];
case 'unique': // 验证某个值是否唯一
if(is_string($val[0]) && strpos($val[0],',')){
$val[0] = explode(',',$val[0]);
if (is_string($val[0]) && strpos($val[0], ',')) {
$val[0] = explode(',', $val[0]);
}
$map = [];
if(is_array($val[0])) {
if (is_array($val[0])) {
// 支持多个字段验证
foreach ($val[0] as $field){
$map[$field] = $data[$field];
foreach ($val[0] as $field) {
$map[$field] = $data[$field];
}
}else{
} else {
$map[$val[0]] = $data[$val[0]];
}
if(!empty($data[$this->getPk()])) { // 完善编辑的时候验证唯一
$map[$this->getPk()] = ['neq',$data[$this->getPk()]];
if (!empty($data[$this->getPk()])) {
// 完善编辑的时候验证唯一
$map[$this->getPk()] = ['neq', $data[$this->getPk()]];
}
return $this->where($map)->find() ? false : true;
default: // 检查附加规则
return $this->check($data[$val[0]],$val[1],$val[4]);
default: // 检查附加规则
return $this->check($data[$val[0]], $val[1], $val[4]);
}
}
@@ -302,50 +324,53 @@ trait Auto {
* @param string $type 验证方式 默认为正则验证
* @return boolean
*/
public function check($value,$rule,$type='regex'){
$type = strtolower(trim($type));
switch($type) {
public function check($value, $rule, $type = 'regex')
{
$type = strtolower(trim($type));
switch ($type) {
case 'in': // 验证是否在某个指定范围之内 逗号分隔字符串或者数组
case 'notin':
$range = is_array($rule)? $rule : explode(',',$rule);
return $type == 'in' ? in_array($value ,$range) : !in_array($value ,$range);
$range = is_array($rule) ? $rule : explode(',', $rule);
return 'in' == $type ? in_array($value, $range) : !in_array($value, $range);
case 'between': // 验证是否在某个范围
case 'notbetween': // 验证是否不在某个范围
if (is_array($rule)){
$min = $rule[0];
$max = $rule[1];
}else{
list($min,$max) = explode(',',$rule);
case 'notbetween': // 验证是否不在某个范围
if (is_array($rule)) {
$min = $rule[0];
$max = $rule[1];
} else {
list($min, $max) = explode(',', $rule);
}
return $type == 'between' ? $value>=$min && $value<=$max : $value<$min || $value>$max;
return 'between' == $type ? $value >= $min && $value <= $max : $value < $min || $value > $max;
case 'equal': // 验证是否等于某个值
case 'notequal': // 验证是否等于某个值
return $type == 'equal' ? $value == $rule : $value != $rule;
case 'notequal': // 验证是否等于某个值
return 'equal' == $type ? $value == $rule : $value != $rule;
case 'length': // 验证长度
$length = mb_strlen($value,'utf-8'); // 当前数据长度
if(strpos($rule,',')) { // 长度区间
list($min,$max) = explode(',',$rule);
$length = mb_strlen($value, 'utf-8'); // 当前数据长度
if (strpos($rule, ',')) {
// 长度区间
list($min, $max) = explode(',', $rule);
return $length >= $min && $length <= $max;
}else{// 指定长度
} else {
// 指定长度
return $length == $rule;
}
case 'expire':
list($start,$end) = explode(',',$rule);
if(!is_numeric($start)) {
$start = strtotime($start);
list($start, $end) = explode(',', $rule);
if (!is_numeric($start)) {
$start = strtotime($start);
}
if(!is_numeric($end)) {
$end = strtotime($end);
if (!is_numeric($end)) {
$end = strtotime($end);
}
return NOW_TIME >= $start && NOW_TIME <= $end;
case 'ip_allow': // IP 操作许可验证
return in_array(get_client_ip(),explode(',',$rule));
return in_array(get_client_ip(), explode(',', $rule));
case 'ip_deny': // IP 操作禁止验证
return !in_array(get_client_ip(),explode(',',$rule));
return !in_array(get_client_ip(), explode(',', $rule));
case 'regex':
default: // 默认使用正则验证 可以使用验证类中定义的验证名称
default: // 默认使用正则验证 可以使用验证类中定义的验证名称
// 检查附加规则
return $this->regex($value,$rule);
return $this->regex($value, $rule);
}
}
@@ -355,8 +380,9 @@ trait Auto {
* @param array $auto 自动完成设置
* @return Model
*/
public function auto($auto){
$this->options['auto'] = $auto;
public function auto($auto)
{
$this->options['auto'] = $auto;
return $this;
}
@@ -366,8 +392,9 @@ trait Auto {
* @param array $validate 自动验证设置
* @return Model
*/
public function validate($validate){
$this->options['validate'] = $validate;
public function validate($validate)
{
$this->options['validate'] = $validate;
return $this;
}
}
}
}

View File

@@ -10,37 +10,42 @@
// +----------------------------------------------------------------------
namespace traits\think\model;
use think\loader;
trait Extend {
protected $partition = [];
/**
use think\Lang;
use think\Loader;
trait Extend
{
protected $partition = [];
/**
* 利用__call方法实现一些特殊的Model方法
* @access public
* @param string $method 方法名称
* @param array $args 调用参数
* @return mixed
*/
public function __call($method,$args) {
if(in_array(strtolower($method),['count','sum','min','max','avg'],true)){
public function __call($method, $args)
{
if (in_array(strtolower($method), ['count', 'sum', 'min', 'max', 'avg'], true)) {
// 统计查询的实现
$field = isset($args[0])?$args[0]:'*';
return $this->getField(strtoupper($method).'('.$field.') AS tp_'.$method);
}elseif(strtolower(substr($method,0,5))=='getby') {
$field = isset($args[0]) ? $args[0] : '*';
return $this->getField(strtoupper($method) . '(' . $field . ') AS tp_' . $method);
} elseif (strtolower(substr($method, 0, 5)) == 'getby') {
// 根据某个字段获取记录
$field = Loader::parseName(substr($method,5));
$where[$field] = $args[0];
$field = Loader::parseName(substr($method, 5));
$where[$field] = $args[0];
return $this->where($where)->find();
}elseif(strtolower(substr($method,0,10))=='getfieldby') {
} elseif (strtolower(substr($method, 0, 10)) == 'getfieldby') {
// 根据某个字段获取记录的某个值
$name = Loader::parseName(substr($method,10));
$where[$name] =$args[0];
$name = Loader::parseName(substr($method, 10));
$where[$name] = $args[0];
return $this->where($where)->getField($args[1]);
}elseif(isset($this->scope[$method])){// 命名范围的单独调用支持
return $this->scope($method,$args[0]);
}else{
throw new \think\Exception(__CLASS__.':'.$method.\think\Lang::get('_METHOD_NOT_EXIST_'));
} elseif (isset($this->scope[$method])) {
// 命名范围的单独调用支持
return $this->scope($method, $args[0]);
} else {
throw new \think\Exception(__CLASS__ . ':' . $method . Lang::get('_METHOD_NOT_EXIST_'));
return;
}
}
@@ -53,11 +58,12 @@ trait Extend {
* @param string $value 字段值
* @return boolean
*/
public function setField($field,$value='') {
if(is_array($field)) {
$data = $field;
}else{
$data[$field] = $value;
public function setField($field, $value = '')
{
if (is_array($field)) {
$data = $field;
} else {
$data[$field] = $value;
}
return $this->save($data);
}
@@ -69,8 +75,9 @@ trait Extend {
* @param integer $step 增长值
* @return boolean
*/
public function setInc($field,$step=1) {
return $this->setField($field,['exp',$field.'+'.$step]);
public function setInc($field, $step = 1)
{
return $this->setField($field, ['exp', $field . '+' . $step]);
}
/**
@@ -80,11 +87,11 @@ trait Extend {
* @param integer $step 减少值
* @return boolean
*/
public function setDec($field,$step=1) {
return $this->setField($field,['exp',$field.'-'.$step]);
public function setDec($field, $step = 1)
{
return $this->setField($field, ['exp', $field . '-' . $step]);
}
/**
* 获取一条记录的某个字段值
* @access public
@@ -92,50 +99,54 @@ trait Extend {
* @param string $spea 字段数据间隔符号 NULL返回数组
* @return mixed
*/
public function getField($field,$sepa=null) {
$options['field'] = $field;
$options = $this->_parseOptions($options);
$field = trim($field);
if(strpos($field,',')) { // 多字段
if(!isset($options['limit'])){
$options['limit'] = is_numeric($sepa)?$sepa:'';
public function getField($field, $sepa = null)
{
$options['field'] = $field;
$options = $this->_parseOptions($options);
$field = trim($field);
if (strpos($field, ',')) {
// 多字段
if (!isset($options['limit'])) {
$options['limit'] = is_numeric($sepa) ? $sepa : '';
}
$resultSet = $this->db->select($options);
if(!empty($resultSet)) {
$field = array_keys($resultSet[0]);
$key = array_shift($field);
$key2 = array_shift($field);
$cols = [];
$count = count(explode(',', $field));
foreach ($resultSet as $result){
$name = $result[$key];
if(2==$count) {
$cols[$name] = $result[$key2];
}else{
$cols[$name] = is_string($sepa)?implode($sepa,$result):$result;
$resultSet = $this->db->select($options);
if (!empty($resultSet)) {
$field = array_keys($resultSet[0]);
$key = array_shift($field);
$key2 = array_shift($field);
$cols = [];
$count = count(explode(',', $field));
foreach ($resultSet as $result) {
$name = $result[$key];
if (2 == $count) {
$cols[$name] = $result[$key2];
} else {
$cols[$name] = is_string($sepa) ? implode($sepa, $result) : $result;
}
}
return $cols;
}
}else{ // 查找一条记录
} else {
// 查找一条记录
// 返回数据个数
if(true !== $sepa) {// 当sepa指定为true的时候 返回所有数据
$options['limit'] = is_numeric($sepa)?$sepa:1;
if (true !== $sepa) {
// 当sepa指定为true的时候 返回所有数据
$options['limit'] = is_numeric($sepa) ? $sepa : 1;
}
$result = $this->db->select($options);
if(!empty($result)) {
if(true !== $sepa && 1==$options['limit']) {
if (!empty($result)) {
if (true !== $sepa && 1 == $options['limit']) {
return reset($result[0]);
}
foreach ($result as $val){
$array[] = $val[$field];
foreach ($result as $val) {
$array[] = $val[$field];
}
return $array;
}
}
return null;
}
/**
* 字段值延迟增长
* @access public
@@ -144,20 +155,23 @@ trait Extend {
* @param integer $lazyTime 延时时间(s)
* @return boolean
*/
public function setLazyInc($field,$step=1,$lazyTime=0) {
$condition = $this->options['where'];
if(empty($condition)) { // 没有条件不做任何更新
public function setLazyInc($field, $step = 1, $lazyTime = 0)
{
$condition = $this->options['where'];
if (empty($condition)) {
// 没有条件不做任何更新
return false;
}
if($lazyTime>0) {// 延迟写入
$guid = md5($this->name.'_'.$field.'_'.serialize($condition));
$step = $this->lazyWrite($guid,$step,$lazyTime);
if(false === $step ) {
if ($lazyTime > 0) {
// 延迟写入
$guid = md5($this->name . '_' . $field . '_' . serialize($condition));
$step = $this->lazyWrite($guid, $step, $lazyTime);
if (false === $step) {
// 等待下次写入
return true;
return true;
}
}
return $this->setField($field,['exp',$field.'+'.$step]);
return $this->setField($field, ['exp', $field . '+' . $step]);
}
/**
@@ -168,20 +182,23 @@ trait Extend {
* @param integer $lazyTime 延时时间(s)
* @return boolean
*/
public function setLazyDec($field,$step=1,$lazyTime=0) {
$condition = $this->options['where'];
if(empty($condition)) { // 没有条件不做任何更新
public function setLazyDec($field, $step = 1, $lazyTime = 0)
{
$condition = $this->options['where'];
if (empty($condition)) {
// 没有条件不做任何更新
return false;
}
if($lazyTime>0) {// 延迟写入
$guid = md5($this->name.'_'.$field.'_'.serialize($condition));
$step = $this->lazyWrite($guid,$step,$lazyTime);
if(false === $step ) {
if ($lazyTime > 0) {
// 延迟写入
$guid = md5($this->name . '_' . $field . '_' . serialize($condition));
$step = $this->lazyWrite($guid, $step, $lazyTime);
if (false === $step) {
// 等待下次写入
return true;
return true;
}
}
return $this->setField($field,['exp',$field.'-'.$step]);
return $this->setField($field, ['exp', $field . '-' . $step]);
}
/**
@@ -193,22 +210,25 @@ trait Extend {
* @param integer $lazyTime 延时时间(s)
* @return false|integer
*/
protected function lazyWrite($guid,$step,$lazyTime) {
if(false !== ($value = F($guid))) { // 存在缓存写入数据
if(time()>S($guid.'_time')+$lazyTime) {
protected function lazyWrite($guid, $step, $lazyTime)
{
if (false !== ($value = F($guid))) {
// 存在缓存写入数据
if (time() > S($guid . '_time') + $lazyTime) {
// 延时更新时间到了,删除缓存数据 并实际写入数据库
S($guid,null);
S($guid.'_time',null);
return $value+$step;
}else{
S($guid, null);
S($guid . '_time', null);
return $value + $step;
} else {
// 追加数据到缓存
S($guid,$value+$step);
S($guid, $value + $step);
return false;
}
}else{ // 没有缓存数据
S($guid,$step);
} else {
// 没有缓存数据
S($guid, $step);
// 计时开始
S($guid.'_time',time());
S($guid . '_time', time());
return false;
}
}
@@ -219,50 +239,51 @@ trait Extend {
* @param array $data 操作的数据
* @return string
*/
public function getPartitionTableName($data=[]) {
public function getPartitionTableName($data = [])
{
// 对数据表进行分区
if(isset($data[$this->partition['field']])) {
$field = $data[$this->partition['field']];
switch($this->partition['type']) {
if (isset($data[$this->partition['field']])) {
$field = $data[$this->partition['field']];
switch ($this->partition['type']) {
case 'id':
// 按照id范围分表
$step = $this->partition['expr'];
$seq = floor($field / $step)+1;
$step = $this->partition['expr'];
$seq = floor($field / $step) + 1;
break;
case 'year':
// 按照年份分表
if(!is_numeric($field)) {
$field = strtotime($field);
if (!is_numeric($field)) {
$field = strtotime($field);
}
$seq = date('Y',$field)-$this->partition['expr']+1;
$seq = date('Y', $field) - $this->partition['expr'] + 1;
break;
case 'mod':
// 按照id的模数分表
$seq = ($field % $this->partition['num'])+1;
$seq = ($field % $this->partition['num']) + 1;
break;
case 'md5':
// 按照md5的序列分表
$seq = (ord(substr(md5($field),0,1)) % $this->partition['num'])+1;
$seq = (ord(substr(md5($field), 0, 1)) % $this->partition['num']) + 1;
break;
default :
if(function_exists($this->partition['type'])) {
default:
if (function_exists($this->partition['type'])) {
// 支持指定函数哈希
$fun = $this->partition['type'];
$seq = (ord(substr($fun($field),0,1)) % $this->partition['num'])+1;
}else{
$fun = $this->partition['type'];
$seq = (ord(substr($fun($field), 0, 1)) % $this->partition['num']) + 1;
} else {
// 按照字段的首字母的值分表
$seq = (ord($field{0}) % $this->partition['num'])+1;
$seq = (ord($field{0}) % $this->partition['num']) + 1;
}
}
return $this->getTableName().'_'.$seq;
}else{
return $this->getTableName() . '_' . $seq;
} else {
// 当设置的分表字段不在查询条件或者数据中
// 进行联合查询,必须设定 partition['num']
$tableName = [];
for($i=0;$i<$this->partition['num'];$i++){
$tableName[] = 'SELECT * FROM '.$this->getTableName().'_'.($i+1);
$tableName = [];
for ($i = 0; $i < $this->partition['num']; $i++) {
$tableName[] = 'SELECT * FROM ' . $this->getTableName() . '_' . ($i + 1);
}
return '( '.implode(" UNION ",$tableName).') AS '.$this->name;
return '( ' . implode(" UNION ", $tableName) . ') AS ' . $this->name;
}
}
}
}

View File

@@ -11,17 +11,19 @@
namespace traits\think\model;
trait Query {
trait Query
{
/**
* 启动事务
* @access public
* @return void
*/
public function startTrans() {
public function startTrans()
{
$this->commit();
$this->db->startTrans();
return ;
return;
}
/**
@@ -29,7 +31,8 @@ trait Query {
* @access public
* @return boolean
*/
public function commit() {
public function commit()
{
return $this->db->commit();
}
@@ -38,7 +41,8 @@ trait Query {
* @access public
* @return boolean
*/
public function rollback() {
public function rollback()
{
return $this->db->rollback();
}
@@ -49,15 +53,17 @@ trait Query {
* @param boolean $parse 是否需要解析SQL
* @return string
*/
public function parseSql($sql,$parse) {
public function parseSql($sql, $parse)
{
// 分析表达式
if(true === $parse) {
$options = $this->_parseOptions();
$sql = $this->db->parseSql($sql,$options);
}elseif(is_array($parse)){ // SQL预处理
$sql = vsprintf($sql,$parse);
}else{
$sql = strtr($sql,['__TABLE__' => $this->getTableName(),'__PREFIX__' => $this->tablePrefix]);
if (true === $parse) {
$options = $this->_parseOptions();
$sql = $this->db->parseSql($sql, $options);
} elseif (is_array($parse)) {
// SQL预处理
$sql = vsprintf($sql, $parse);
} else {
$sql = strtr($sql, ['__TABLE__' => $this->getTableName(), '__PREFIX__' => $this->tablePrefix]);
}
return $sql;
}
@@ -69,16 +75,17 @@ trait Query {
* @param array $sql SQL批处理指令
* @return boolean
*/
public function patchQuery($sql=[]) {
if(!is_array($sql)) {
public function patchQuery($sql = [])
{
if (!is_array($sql)) {
return false;
}
// 自动启动事务支持
$this->startTrans();
try{
foreach ($sql as $_sql){
$result = $this->execute($_sql);
if(false === $result) {
try {
foreach ($sql as $_sql) {
$result = $this->execute($_sql);
if (false === $result) {
// 发生错误自动回滚事务
$this->rollback();
return false;
@@ -90,5 +97,5 @@ trait Query {
$this->rollback();
}
return true;
}
}
}
}

View File

@@ -11,60 +11,77 @@
namespace traits\think\model;
define('HAS_ONE',1);
define('BELONGS_TO',2);
define('HAS_MANY',3);
define('MANY_TO_MANY',4);
define('HAS_ONE', 1);
define('BELONGS_TO', 2);
define('HAS_MANY', 3);
define('MANY_TO_MANY', 4);
trait Relation {
trait Relation
{
// 关联定义
protected $link = [];
protected $link = [];
/**
* 得到关联的数据表名
* @access public
* @return string
*/
public function getRelationTableName($relation) {
$relationTable = !empty($this->tablePrefix) ? $this->tablePrefix : '';
$relationTable .= $this->tableName?$this->tableName:$this->name;
$relationTable .= '_'.$relation->getModelName();
public function getRelationTableName($relation)
{
$relationTable = !empty($this->tablePrefix) ? $this->tablePrefix : '';
$relationTable .= $this->tableName ? $this->tableName : $this->name;
$relationTable .= '_' . $relation->getModelName();
return strtolower($relationTable);
}
// 查询成功后的回调方法
protected function _after_find(&$result,$options) {
protected function _after_find(&$result, $options)
{
// 获取关联数据 并附加到结果中
if(!empty($options['link']))
$this->getRelation($result,$options['link']);
if (!empty($options['link'])) {
$this->getRelation($result, $options['link']);
}
}
// 查询数据集成功后的回调方法
protected function _after_select(&$result,$options) {
protected function _after_select(&$result, $options)
{
// 获取关联数据 并附加到结果中
if(!empty($options['link']))
$this->getRelations($result,$options['link']);
if (!empty($options['link'])) {
$this->getRelations($result, $options['link']);
}
}
// 写入成功后的回调方法
protected function _after_insert($data,$options) {
protected function _after_insert($data, $options)
{
// 关联写入
if(!empty($options['link']))
$this->opRelation('ADD',$data,$options['link']);
if (!empty($options['link'])) {
$this->opRelation('ADD', $data, $options['link']);
}
}
// 更新成功后的回调方法
protected function _after_update($data,$options) {
protected function _after_update($data, $options)
{
// 关联更新
if(!empty($options['link']))
$this->opRelation('SAVE',$data,$options['link']);
if (!empty($options['link'])) {
$this->opRelation('SAVE', $data, $options['link']);
}
}
// 删除成功后的回调方法
protected function _after_delete($data,$options) {
protected function _after_delete($data, $options)
{
// 关联删除
if(!empty($options['link']))
$this->opRelation('DEL',$data,$options['link']);
if (!empty($options['link'])) {
$this->opRelation('DEL', $data, $options['link']);
}
}
/**
@@ -73,10 +90,11 @@ trait Relation {
* @param mixed $data 要操作的数据
* @return boolean
*/
protected function _write_data($data) {
protected function _write_data($data)
{
$this->_before_write($data);
return $data;
}
}
/**
* 获取返回数据集的关联记录
@@ -85,11 +103,12 @@ trait Relation {
* @param string|array $name 关联名称
* @return array
*/
protected function getRelations(&$resultSet,$name='') {
protected function getRelations(&$resultSet, $name = '')
{
// 获取记录集的主键列表
foreach($resultSet as $key=>$val) {
$val = $this->getRelation($val,$name);
$resultSet[$key] = $val;
foreach ($resultSet as $key => $val) {
$val = $this->getRelation($val, $name);
$resultSet[$key] = $val;
}
return $resultSet;
}
@@ -102,90 +121,91 @@ trait Relation {
* @param boolean $return 是否返回关联数据本身
* @return array
*/
protected function getRelation(&$result,$name='',$return=false) {
if(!empty($this->link)) {
foreach($this->link as $key=>$val) {
$mappingName = !empty($val['mapping_name'])?$val['mapping_name']:$key; // 映射名称
if(empty($name) || true === $name || $mappingName == $name || (is_array($name) && in_array($mappingName,$name))) {
$mappingType = !empty($val['mapping_type'])?$val['mapping_type']:$val; // 关联类型
$mappingClass = !empty($val['class_name'])?$val['class_name']:$key; // 关联类
$mappingFields = !empty($val['mapping_fields'])?$val['mapping_fields']:'*'; // 映射字段
$mappingCondition = !empty($val['condition'])?$val['condition']:'1=1'; // 关联条件
$mappingKey =!empty($val['mapping_key'])? $val['mapping_key'] : $this->getPk(); // 关联键名
if(strtoupper($mappingClass)==strtoupper($this->name)) {
// 自引用关联 获取父键名
$mappingFk = !empty($val['parent_key'])? $val['parent_key'] : 'parent_id';
}else{
$mappingFk = !empty($val['foreign_key'])?$val['foreign_key']:strtolower($this->name).'_id'; // 关联外键
}
// 获取关联模型对象
$model = D($mappingClass);
switch($mappingType) {
case HAS_ONE:
$pk = $result[$mappingKey];
$mappingCondition .= " AND {$mappingFk}='{$pk}'";
$relationData = $model->where($mappingCondition)->field($mappingFields)->find();
break;
case BELONGS_TO:
if(strtoupper($mappingClass)==strtoupper($this->name)) {
// 自引用关联 获取父键名
$mappingFk = !empty($val['parent_key'])? $val['parent_key'] : 'parent_id';
}else{
$mappingFk = !empty($val['foreign_key'])?$val['foreign_key']:strtolower($model->getModelName()).'_id'; // 关联外键
}
$fk = $result[$mappingFk];
$mappingCondition .= " AND {$model->getPk()}='{$fk}'";
$relationData = $model->where($mappingCondition)->field($mappingFields)->find();
break;
case HAS_MANY:
$pk = $result[$mappingKey];
$mappingCondition .= " AND {$mappingFk}='{$pk}'";
$mappingOrder = !empty($val['mapping_order'])?$val['mapping_order']:'';
$mappingLimit = !empty($val['mapping_limit'])?$val['mapping_limit']:'';
// 延时获取关联记录
$relationData = $model->where($mappingCondition)->field($mappingFields)->order($mappingOrder)->limit($mappingLimit)->select();
break;
case MANY_TO_MANY:
$pk = $result[$mappingKey];
$mappingCondition = " {$mappingFk}='{$pk}'";
$mappingOrder = $val['mapping_order'];
$mappingLimit = $val['mapping_limit'];
$mappingRelationFk = $val['relation_foreign_key']?$val['relation_foreign_key']:$model->getModelName().'_id';
$mappingRelationTable = $val['relation_table']?$val['relation_table']:$this->getRelationTableName($model);
$sql = "SELECT b.{$mappingFields} FROM {$mappingRelationTable} AS a, ".$model->getTableName()." AS b WHERE a.{$mappingRelationFk} = b.{$model->getPk()} AND a.{$mappingCondition}";
if(!empty($val['condition'])) {
$sql .= ' AND '.$val['condition'];
}
if(!empty($mappingOrder)) {
$sql .= ' ORDER BY '.$mappingOrder;
}
if(!empty($mappingLimit)) {
$sql .= ' LIMIT '.$mappingLimit;
}
$relationData = $this->query($sql);
break;
}
if(!$return){
if(isset($val['as_fields']) && in_array($mappingType,[HAS_ONE,BELONGS_TO]) ) {
// 支持直接把关联的字段值映射成数据对象中的某个字段
// 仅仅支持HAS_ONE BELONGS_TO
$fields = explode(',',$val['as_fields']);
foreach ($fields as $field){
if(strpos($field,':')) {
list($relationName,$nick) = explode(':',$field);
$result[$nick] = $relationData[$relationName];
}else{
$result[$field] = $relationData[$field];
}
}
}else{
$result[$mappingName] = $relationData;
}
unset($relationData);
}else{
return $relationData;
}
protected function getRelation(&$result, $name = '', $return = false)
{
if (!empty($this->link)) {
foreach ($this->link as $key => $val) {
$mappingName = !empty($val['mapping_name']) ? $val['mapping_name'] : $key; // 映射名称
if (empty($name) || true === $name || $mappingName == $name || (is_array($name) && in_array($mappingName, $name))) {
$mappingType = !empty($val['mapping_type']) ? $val['mapping_type'] : $val; // 关联类
$mappingClass = !empty($val['class_name']) ? $val['class_name'] : $key; // 关联类名
$mappingFields = !empty($val['mapping_fields']) ? $val['mapping_fields'] : '*'; // 映射字段
$mappingCondition = !empty($val['condition']) ? $val['condition'] : '1=1'; // 关联条件
$mappingKey = !empty($val['mapping_key']) ? $val['mapping_key'] : $this->getPk(); // 关联键名
if (strtoupper($mappingClass) == strtoupper($this->name)) {
// 自引用关联 获取父键名
$mappingFk = !empty($val['parent_key']) ? $val['parent_key'] : 'parent_id';
} else {
$mappingFk = !empty($val['foreign_key']) ? $val['foreign_key'] : strtolower($this->name) . '_id'; // 关联外键
}
// 获取关联模型对象
$model = D($mappingClass);
switch ($mappingType) {
case HAS_ONE:
$pk = $result[$mappingKey];
$mappingCondition .= " AND {$mappingFk}='{$pk}'";
$relationData = $model->where($mappingCondition)->field($mappingFields)->find();
break;
case BELONGS_TO:
if (strtoupper($mappingClass) == strtoupper($this->name)) {
// 自引用关联 获取父键名
$mappingFk = !empty($val['parent_key']) ? $val['parent_key'] : 'parent_id';
} else {
$mappingFk = !empty($val['foreign_key']) ? $val['foreign_key'] : strtolower($model->getModelName()) . '_id'; // 关联外键
}
$fk = $result[$mappingFk];
$mappingCondition .= " AND {$model->getPk()}='{$fk}'";
$relationData = $model->where($mappingCondition)->field($mappingFields)->find();
break;
case HAS_MANY:
$pk = $result[$mappingKey];
$mappingCondition .= " AND {$mappingFk}='{$pk}'";
$mappingOrder = !empty($val['mapping_order']) ? $val['mapping_order'] : '';
$mappingLimit = !empty($val['mapping_limit']) ? $val['mapping_limit'] : '';
// 延时获取关联记录
$relationData = $model->where($mappingCondition)->field($mappingFields)->order($mappingOrder)->limit($mappingLimit)->select();
break;
case MANY_TO_MANY:
$pk = $result[$mappingKey];
$mappingCondition = " {$mappingFk}='{$pk}'";
$mappingOrder = $val['mapping_order'];
$mappingLimit = $val['mapping_limit'];
$mappingRelationFk = $val['relation_foreign_key'] ? $val['relation_foreign_key'] : $model->getModelName() . '_id';
$mappingRelationTable = $val['relation_table'] ? $val['relation_table'] : $this->getRelationTableName($model);
$sql = "SELECT b.{$mappingFields} FROM {$mappingRelationTable} AS a, " . $model->getTableName() . " AS b WHERE a.{$mappingRelationFk} = b.{$model->getPk()} AND a.{$mappingCondition}";
if (!empty($val['condition'])) {
$sql .= ' AND ' . $val['condition'];
}
if (!empty($mappingOrder)) {
$sql .= ' ORDER BY ' . $mappingOrder;
}
if (!empty($mappingLimit)) {
$sql .= ' LIMIT ' . $mappingLimit;
}
$relationData = $this->query($sql);
break;
}
if (!$return) {
if (isset($val['as_fields']) && in_array($mappingType, [HAS_ONE, BELONGS_TO])) {
// 支持直接把关联的字段值映射成数据对象中的某个字段
// 仅仅支持HAS_ONE BELONGS_TO
$fields = explode(',', $val['as_fields']);
foreach ($fields as $field) {
if (strpos($field, ':')) {
list($relationName, $nick) = explode(':', $field);
$result[$nick] = $relationData[$relationName];
} else {
$result[$field] = $relationData[$field];
}
}
} else {
$result[$mappingName] = $relationData;
}
unset($relationData);
} else {
return $relationData;
}
}
}
}
return $result;
@@ -199,121 +219,130 @@ trait Relation {
* @param string $name 关联名称
* @return mixed
*/
protected function opRelation($opType,$data='',$name='') {
$result = false;
if(empty($data) && !empty($this->data)){
protected function opRelation($opType, $data = '', $name = '')
{
$result = false;
if (empty($data) && !empty($this->data)) {
$data = $this->data;
}elseif(!is_array($data)){
} elseif (!is_array($data)) {
// 数据无效返回
return false;
}
if(!empty($this->link)) {
if (!empty($this->link)) {
// 遍历关联定义
foreach($this->link as $key=>$val) {
// 操作制定关联类型
$mappingName = $val['mapping_name']?$val['mapping_name']:$key; // 映射名称
if(empty($name) || true === $name || $mappingName == $name || (is_array($name) && in_array($mappingName,$name)) ) {
// 操作制定的关联
$mappingType = !empty($val['mapping_type'])?$val['mapping_type']:$val; // 关联类型
$mappingClass = !empty($val['class_name'])?$val['class_name']:$key; // 关联类名
$mappingKey =!empty($val['mapping_key'])? $val['mapping_key'] : $this->getPk(); // 关联键名
// 当前数据对象主键值
$pk = $data[$mappingKey];
if(strtoupper($mappingClass)==strtoupper($this->name)) {
// 自引用关联 获取父键名
$mappingFk = !empty($val['parent_key'])? $val['parent_key'] : 'parent_id';
}else{
$mappingFk = !empty($val['foreign_key'])?$val['foreign_key']:strtolower($this->name).'_id'; // 关联外键
}
if(!empty($val['condition'])) {
$mappingCondition = $val['condition'];
}else{
$mappingCondition = [];
$mappingCondition[$mappingFk] = $pk;
}
// 获取关联model对象
$model = D($mappingClass);
$mappingData = isset($data[$mappingName])?$data[$mappingName]:false;
if(!empty($mappingData) || $opType == 'DEL') {
switch($mappingType) {
case HAS_ONE:
switch (strtoupper($opType)){
case 'ADD': // 增加关联数据
$mappingData[$mappingFk] = $pk;
$result = $model->add($mappingData);
foreach ($this->link as $key => $val) {
// 操作制定关联类型
$mappingName = $val['mapping_name'] ? $val['mapping_name'] : $key; // 映射名称
if (empty($name) || true === $name || $mappingName == $name || (is_array($name) && in_array($mappingName, $name))) {
// 操作制定的关联
$mappingType = !empty($val['mapping_type']) ? $val['mapping_type'] : $val; // 关联类型
$mappingClass = !empty($val['class_name']) ? $val['class_name'] : $key; // 关联类名
$mappingKey = !empty($val['mapping_key']) ? $val['mapping_key'] : $this->getPk(); // 关联键名
// 当前数据对象主键值
$pk = $data[$mappingKey];
if (strtoupper($mappingClass) == strtoupper($this->name)) {
// 自引用关联 获取父键名
$mappingFk = !empty($val['parent_key']) ? $val['parent_key'] : 'parent_id';
} else {
$mappingFk = !empty($val['foreign_key']) ? $val['foreign_key'] : strtolower($this->name) . '_id'; // 关联外键
}
if (!empty($val['condition'])) {
$mappingCondition = $val['condition'];
} else {
$mappingCondition = [];
$mappingCondition[$mappingFk] = $pk;
}
// 获取关联model对象
$model = D($mappingClass);
$mappingData = isset($data[$mappingName]) ? $data[$mappingName] : false;
if (!empty($mappingData) || 'DEL' == $opType) {
switch ($mappingType) {
case HAS_ONE:
switch (strtoupper($opType)) {
case 'ADD': // 增加关联数据
$mappingData[$mappingFk] = $pk;
$result = $model->add($mappingData);
break;
case 'SAVE': // 更新关联数据
$result = $model->where($mappingCondition)->save($mappingData);
case 'SAVE': // 更新关联数据
$result = $model->where($mappingCondition)->save($mappingData);
break;
case 'DEL': // 根据外键删除关联数据
$result = $model->where($mappingCondition)->delete();
case 'DEL': // 根据外键删除关联数据
$result = $model->where($mappingCondition)->delete();
break;
}
break;
case BELONGS_TO:
break;
case HAS_MANY:
switch (strtoupper($opType)){
case 'ADD' : // 增加关联数据
}
break;
case BELONGS_TO:
break;
case HAS_MANY:
switch (strtoupper($opType)) {
case 'ADD': // 增加关联数据
$model->startTrans();
foreach ($mappingData as $val){
$val[$mappingFk] = $pk;
$result = $model->add($val);
foreach ($mappingData as $val) {
$val[$mappingFk] = $pk;
$result = $model->add($val);
}
$model->commit();
break;
case 'SAVE' : // 更新关联数据
case 'SAVE': // 更新关联数据
$model->startTrans();
$pk = $model->getPk();
foreach ($mappingData as $vo){
if(isset($vo[$pk])) {// 更新数据
$mappingCondition = "$pk ={$vo[$pk]}";
$result = $model->where($mappingCondition)->save($vo);
}else{ // 新增数据
$vo[$mappingFk] = $data[$mappingKey];
$result = $model->add($vo);
$pk = $model->getPk();
foreach ($mappingData as $vo) {
if (isset($vo[$pk])) {
// 更新数据
$mappingCondition = "$pk ={$vo[$pk]}";
$result = $model->where($mappingCondition)->save($vo);
} else {
// 新增数据
$vo[$mappingFk] = $data[$mappingKey];
$result = $model->add($vo);
}
}
$model->commit();
break;
case 'DEL' : // 删除关联数据
$result = $model->where($mappingCondition)->delete();
case 'DEL': // 删除关联数据
$result = $model->where($mappingCondition)->delete();
break;
}
break;
case MANY_TO_MANY:
$mappingRelationFk = $val['relation_foreign_key'] ? $val['relation_foreign_key'] : $model->getModelName() . '_id'; // 关联
$mappingRelationTable = $val['relation_table'] ? $val['relation_table'] : $this->getRelationTableName($model);
if (is_array($mappingData)) {
$ids = [];
foreach ($mappingData as $vo) {
$ids[] = $vo[$mappingKey];
}
break;
case MANY_TO_MANY:
$mappingRelationFk = $val['relation_foreign_key']?$val['relation_foreign_key']:$model->getModelName().'_id';// 关联
$mappingRelationTable = $val['relation_table']?$val['relation_table']:$this->getRelationTableName($model);
if(is_array($mappingData)) {
$ids = [];
foreach ($mappingData as $vo)
$ids[] = $vo[$mappingKey];
$relationId = implode(',',$ids);
}
switch (strtoupper($opType)){
case 'ADD': // 增加关联数据
case 'SAVE': // 更新关联数据
if(isset($relationId)) {
$relationId = implode(',', $ids);
}
switch (strtoupper($opType)) {
case 'ADD': // 增加关联数据
case 'SAVE': // 更新关联数据
if (isset($relationId)) {
$this->startTrans();
// 删除关联表数据
$this->table($mappingRelationTable)->where($mappingCondition)->delete();
// 插入关联表数据
$sql = 'INSERT INTO '.$mappingRelationTable.' ('.$mappingFk.','.$mappingRelationFk.') SELECT a.'.$this->getPk().',b.'.$model->getPk().' FROM '.$this->getTableName().' AS a ,'.$model->getTableName()." AS b where a.".$this->getPk().' ='. $pk.' AND b.'.$model->getPk().' IN ('.$relationId.") ";
$result = $model->execute($sql);
if(false !== $result)
// 提交事务
$sql = 'INSERT INTO ' . $mappingRelationTable . ' (' . $mappingFk . ',' . $mappingRelationFk . ') SELECT a.' . $this->getPk() . ',b.' . $model->getPk() . ' FROM ' . $this->getTableName() . ' AS a ,' . $model->getTableName() . " AS b where a." . $this->getPk() . ' =' . $pk . ' AND b.' . $model->getPk() . ' IN (' . $relationId . ") ";
$result = $model->execute($sql);
if (false !== $result)
// 提交事务
{
$this->commit();
else
// 事务回滚
} else
// 事务回滚
{
$this->rollback();
}
}
break;
case 'DEL': // 根据外键删除中间表关联数据
$result = $this->table($mappingRelationTable)->where($mappingCondition)->delete();
case 'DEL': // 根据外键删除中间表关联数据
$result = $this->table($mappingRelationTable)->where($mappingCondition)->delete();
break;
}
break;
}
}
break;
}
}
}
}
@@ -327,8 +356,9 @@ trait Relation {
* @param mixed $name 关联名称
* @return Model
*/
public function relation($name) {
$this->options['link'] = $name;
public function relation($name)
{
$this->options['link'] = $name;
return $this;
}
@@ -338,9 +368,12 @@ trait Relation {
* @param string $name 关联名称
* @return array
*/
public function relationGet($name) {
if(empty($this->data))
public function relationGet($name)
{
if (empty($this->data)) {
return false;
return $this->getRelation($this->data,$name,true);
}
return $this->getRelation($this->data, $name, true);
}
}
}

View File

@@ -11,46 +11,49 @@
namespace traits\think\model;
trait View {
protected $viewFields = [];
trait View
{
protected $viewFields = [];
/**
* 自动检测数据表信息
* @access protected
* @return void
*/
protected function _checkTableInfo() {}
protected function _checkTableInfo()
{}
/**
* 得到完整的数据表名
* @access public
* @return string
*/
public function getTableName() {
if(empty($this->trueTableName)) {
public function getTableName()
{
if (empty($this->trueTableName)) {
$tableName = '';
foreach ($this->viewFields as $key=>$view){
foreach ($this->viewFields as $key => $view) {
// 获取数据表名称
if(isset($view['_table'])) {
if (isset($view['_table'])) {
// 2011/10/17 添加实际表名定义支持 可以实现同一个表的视图
$tableName .= $view['_table'];
}else{
$class = $key.'Model';
$model = class_exists($class)? new $class() : M($key);
$tableName .= $model->getTableName();
$tableName .= $view['_table'];
} else {
$class = $key . 'Model';
$model = class_exists($class) ? new $class() : M($key);
$tableName .= $model->getTableName();
}
// 表别名定义
$tableName .= !empty($view['_as'])? ' '.$view['_as'] :' '.$key;
$tableName .= !empty($view['_as']) ? ' ' . $view['_as'] : ' ' . $key;
// 支持ON 条件定义
$tableName .= !empty($view['_on'])? ' ON '.$view['_on'] : '';
$tableName .= !empty($view['_on']) ? ' ON ' . $view['_on'] : '';
// 指定JOIN类型 例如 RIGHT INNER LEFT 下一个表有效
$type = !empty($view['_type'])?$view['_type']:'';
$tableName .= ' '.strtoupper($type).' JOIN ';
$len = strlen($type.'_JOIN ');
$type = !empty($view['_type']) ? $view['_type'] : '';
$tableName .= ' ' . strtoupper($type) . ' JOIN ';
$len = strlen($type . '_JOIN ');
}
$tableName = substr($tableName,0,-$len);
$this->trueTableName = $tableName;
$tableName = substr($tableName, 0, -$len);
$this->trueTableName = $tableName;
}
return $this->trueTableName;
}
@@ -61,20 +64,21 @@ trait View {
* @param string $options 表达式
* @return void
*/
protected function _options_filter(&$options) {
if(isset($options['field'])){
$options['field'] = $this->checkFields($options['field']);
}else{
$options['field'] = $this->checkFields();
protected function _options_filter(&$options)
{
if (isset($options['field'])) {
$options['field'] = $this->checkFields($options['field']);
} else {
$options['field'] = $this->checkFields();
}
if(isset($options['group'])){
$options['group'] = $this->checkGroup($options['group']);
if (isset($options['group'])) {
$options['group'] = $this->checkGroup($options['group']);
}
if(isset($options['where'])){
$options['where'] = $this->checkCondition($options['where']);
if (isset($options['where'])) {
$options['where'] = $this->checkCondition($options['where']);
}
if(isset($options['order'])){
$options['order'] = $this->checkOrder($options['order']);
if (isset($options['order'])) {
$options['order'] = $this->checkOrder($options['order']);
}
}
@@ -85,9 +89,11 @@ trait View {
* @param array $fields 字段数组
* @return array
*/
private function _checkFields($name,$fields) {
if(false !== $pos = array_search('*',$fields)) {// 定义所有字段
$fields = array_merge($fields,M($name)->getDbFields());
private function _checkFields($name, $fields)
{
if (false !== $pos = array_search('*', $fields)) {
// 定义所有字段
$fields = array_merge($fields, M($name)->getDbFields());
unset($fields[$pos]);
}
return $fields;
@@ -99,24 +105,25 @@ trait View {
* @param mixed $data 条件表达式
* @return array
*/
protected function checkCondition($where) {
if(is_array($where)) {
$view = [];
protected function checkCondition($where)
{
if (is_array($where)) {
$view = [];
// 检查视图字段
foreach ($this->viewFields as $key=>$val){
$k = isset($val['_as'])?$val['_as']:$key;
$val = $this->_checkFields($key,$val);
foreach ($where as $name=>$value){
if(false !== $field = array_search($name,$val,true)) {
foreach ($this->viewFields as $key => $val) {
$k = isset($val['_as']) ? $val['_as'] : $key;
$val = $this->_checkFields($key, $val);
foreach ($where as $name => $value) {
if (false !== $field = array_search($name, $val, true)) {
// 存在视图字段
$_key = is_numeric($field)? $k.'.'.$name : $k.'.'.$field;
$view[$_key] = $value;
$_key = is_numeric($field) ? $k . '.' . $name : $k . '.' . $field;
$view[$_key] = $value;
unset($where[$name]);
}
}
}
$where = array_merge($where,$view);
}
$where = array_merge($where, $view);
}
return $where;
}
@@ -126,28 +133,29 @@ trait View {
* @param string $order 字段
* @return string
*/
protected function checkOrder($order='') {
if(is_string($order) && !empty($order)) {
$orders = explode(',',$order);
protected function checkOrder($order = '')
{
if (is_string($order) && !empty($order)) {
$orders = explode(',', $order);
$_order = [];
foreach ($orders as $order){
$array = explode(' ',$order);
$field = $array[0];
$sort = isset($array[1])? $array[1] : 'ASC';
foreach ($orders as $order) {
$array = explode(' ', $order);
$field = $array[0];
$sort = isset($array[1]) ? $array[1] : 'ASC';
// 解析成视图字段
foreach ($this->viewFields as $name=>$val){
$k = isset($val['_as']) ? $val['_as'] : $name;
$val = $this->_checkFields($name,$val);
if(false !== $_field = array_search($field,$val,true)) {
foreach ($this->viewFields as $name => $val) {
$k = isset($val['_as']) ? $val['_as'] : $name;
$val = $this->_checkFields($name, $val);
if (false !== $_field = array_search($field, $val, true)) {
// 存在视图字段
$field = is_numeric($_field)? $k.'.'.$field : $k.'.'.$_field;
$field = is_numeric($_field) ? $k . '.' . $field : $k . '.' . $_field;
break;
}
}
$_order[] = $field.' '.$sort;
$_order[] = $field . ' ' . $sort;
}
$order = implode(',',$_order);
}
$order = implode(',', $_order);
}
return $order;
}
@@ -157,25 +165,26 @@ trait View {
* @param string $group 字段
* @return string
*/
protected function checkGroup($group='') {
if(!empty($group)) {
$groups = explode(',',$group);
protected function checkGroup($group = '')
{
if (!empty($group)) {
$groups = explode(',', $group);
$_group = [];
foreach ($groups as $field){
foreach ($groups as $field) {
// 解析成视图字段
foreach ($this->viewFields as $name=>$val){
$k = isset($val['_as'])? $val['_as'] : $name;
$val = $this->_checkFields($name,$val);
if(false !== $_field = array_search($field,$val,true)) {
foreach ($this->viewFields as $name => $val) {
$k = isset($val['_as']) ? $val['_as'] : $name;
$val = $this->_checkFields($name, $val);
if (false !== $_field = array_search($field, $val, true)) {
// 存在视图字段
$field = is_numeric($_field)? $k.'.'.$field : $k.'.'.$_field;
$field = is_numeric($_field) ? $k . '.' . $field : $k . '.' . $_field;
break;
}
}
$_group[] = $field;
}
$group = implode(',',$_group);
}
$group = implode(',', $_group);
}
return $group;
}
@@ -185,62 +194,63 @@ trait View {
* @param string $fields 字段
* @return string
*/
protected function checkFields($fields='') {
if(empty($fields) || '*'==$fields ) {
protected function checkFields($fields = '')
{
if (empty($fields) || '*' == $fields) {
// 获取全部视图字段
$fields = [];
foreach ($this->viewFields as $name=>$val){
$k = isset($val['_as'])? $val['_as'] : $name;
$val = $this->_checkFields($name,$val);
foreach ($val as $key=>$field){
if(is_numeric($key)) {
$fields[] = $k.'.'.$field.' AS '.$field;
}elseif('_' != substr($key,0,1)) {
$fields = [];
foreach ($this->viewFields as $name => $val) {
$k = isset($val['_as']) ? $val['_as'] : $name;
$val = $this->_checkFields($name, $val);
foreach ($val as $key => $field) {
if (is_numeric($key)) {
$fields[] = $k . '.' . $field . ' AS ' . $field;
} elseif ('_' != substr($key, 0, 1)) {
// 以_开头的为特殊定义
if( false !== strpos($key,'*') || false !== strpos($key,'(') || false !== strpos($key,'.')) {
if (false !== strpos($key, '*') || false !== strpos($key, '(') || false !== strpos($key, '.')) {
//如果包含* 或者 使用了sql方法 则不再添加前面的表名
$fields[] = $key.' AS '.$field;
}else{
$fields[] = $k.'.'.$key.' AS '.$field;
$fields[] = $key . ' AS ' . $field;
} else {
$fields[] = $k . '.' . $key . ' AS ' . $field;
}
}
}
}
$fields = implode(',',$fields);
}else{
if(!is_array($fields)){
$fields = explode(',',$fields);
$fields = implode(',', $fields);
} else {
if (!is_array($fields)) {
$fields = explode(',', $fields);
}
// 解析成视图字段
$array = [];
foreach ($fields as $key=>$field){
if(strpos($field,'(') || strpos(strtolower($field),' as ')){
$array = [];
foreach ($fields as $key => $field) {
if (strpos($field, '(') || strpos(strtolower($field), ' as ')) {
// 使用了函数或者别名
$array[] = $field;
$array[] = $field;
unset($fields[$key]);
}
}
foreach ($this->viewFields as $name=>$val){
$k = isset($val['_as'])? $val['_as'] : $name;
$val = $this->_checkFields($name,$val);
foreach ($fields as $key=>$field){
if(false !== $_field = array_search($field,$val,true)) {
foreach ($this->viewFields as $name => $val) {
$k = isset($val['_as']) ? $val['_as'] : $name;
$val = $this->_checkFields($name, $val);
foreach ($fields as $key => $field) {
if (false !== $_field = array_search($field, $val, true)) {
// 存在视图字段
if(is_numeric($_field)) {
$array[] = $k.'.'.$field.' AS '.$field;
}elseif('_' != substr($_field,0,1)){
if( false !== strpos($_field,'*') || false !== strpos($_field,'(') || false !== strpos($_field,'.')){
if (is_numeric($_field)) {
$array[] = $k . '.' . $field . ' AS ' . $field;
} elseif ('_' != substr($_field, 0, 1)) {
if (false !== strpos($_field, '*') || false !== strpos($_field, '(') || false !== strpos($_field, '.')) {
//如果包含* 或者 使用了sql方法 则不再添加前面的表名
$array[] = $_field.' AS '.$field;
}else{
$array[] = $k.'.'.$_field.' AS '.$field;
$array[] = $_field . ' AS ' . $field;
} else {
$array[] = $k . '.' . $_field . ' AS ' . $field;
}
}
}
}
}
$fields = implode(',',$array);
$fields = implode(',', $array);
}
return $fields;
}
}
}
}