* Add sql check and modify zentao sql.

This commit is contained in:
songchenxuan
2023-06-20 10:16:26 +08:00
parent e76f50a3f0
commit fa3a7dc79e
8 changed files with 65 additions and 8 deletions
+1
View File
@@ -56,6 +56,7 @@ $lang->dataview->default = 'Default Group';
$lang->dataview->relatedTable = 'Table';
$lang->dataview->relatedField = 'Field';
$lang->dataview->multilingual = 'After switching the system language, the corresponding name will be displayed';
$lang->dataview->duplicateField = 'Duplicate field names exist: <strong>%s</strong>. You are advised to: (1) Modify the <strong>*</strong> query to a specific field. (2) Use <strong>as</strong> to alias the field.';
$lang->dataview->varFilter = new stdclass();
$lang->dataview->varFilter->varCode = 'Var Code';
+1
View File
@@ -56,6 +56,7 @@ $lang->dataview->default = 'Default Group';
$lang->dataview->relatedTable = 'Table';
$lang->dataview->relatedField = 'Field';
$lang->dataview->multilingual = 'After switching the system language, the corresponding name will be displayed';
$lang->dataview->duplicateField = 'Duplicate field names exist: <strong>%s</strong>. You are advised to: (1) Modify the <strong>*</strong> query to a specific field. (2) Use <strong>as</strong> to alias the field.';
$lang->dataview->varFilter = new stdclass();
$lang->dataview->varFilter->varCode = 'Var Code';
+1
View File
@@ -56,6 +56,7 @@ $lang->dataview->default = 'Default Group';
$lang->dataview->relatedTable = 'Table';
$lang->dataview->relatedField = 'Field';
$lang->dataview->multilingual = 'After switching the system language, the corresponding name will be displayed';
$lang->dataview->duplicateField = 'Duplicate field names exist: <strong>%s</strong>. You are advised to: (1) Modify the <strong>*</strong> query to a specific field. (2) Use <strong>as</strong> to alias the field.';
$lang->dataview->varFilter = new stdclass();
$lang->dataview->varFilter->varCode = 'Var Code';
+1
View File
@@ -56,6 +56,7 @@ $lang->dataview->default = '默认分组';
$lang->dataview->relatedTable = '所属表';
$lang->dataview->relatedField = '对应字段';
$lang->dataview->multilingual = '切换系统语言项后,将显示对应名称';
$lang->dataview->duplicateField = '存在重复的字段名: <strong>%s</strong>。建议您:(1)修改 <strong>*</strong> 查询为具体的字段。(2)使用 <strong>as</strong> 为字段设置别名。';
$lang->dataview->varFilter = new stdclass();
$lang->dataview->varFilter->varCode = '变量代号';
+31
View File
@@ -168,6 +168,37 @@ class dataviewModel extends model
return $columnTypes;
}
/**
* Check that the column of an sql query is unique.
*
* @param string $sql
* @param bool $repeat
* @access public
* @return bool
*/
public function checkUniColumn($sql, $repeat = false)
{
$columns = $this->dao->getColumns($sql);
$isUnique = true;
$columnList = array();
$repeatColumn = array();
foreach($columns as $column)
{
$field = $column['name'];
if(isset($columnTypes[$field]))
{
$isUnique = false;
$repeatColumn[$field] = $field;
}
$columnTypes[$field] = $field;
}
if($repeat) return array($isUnique, $repeatColumn);
return $isUnique;
}
/**
* Get type options
*