提交 f338d6ce 编写于 作者: aaronchen2k2k's avatar aaronchen2k2k

close task#7677,7678

上级 559b4cb3
......@@ -12,4 +12,16 @@ fields:
- field: test2
from: base.name.numbers.v1.yaml
use: numbers
postfix: "\t"
- field: test3
from: name.en.given.v1
select: name
where: "`index`='b'"
postfix: "\t"
- field: test4
from: name.en.family.v1
select: name
where: "`index`='c'"
postfix: "\t"
\ No newline at end of file
......@@ -101,9 +101,9 @@ func ConvertExcelToSQLiteIfNeeded(dbName string, path string) (firstSheet string
} else {
colProp = "VARCHAR"
}
colDefine = " " + colDefine + val + " " + colProp
colDefine = " " + colDefine + "`" + val + "` " + colProp
colList = colList + val
colList = colList + "`" + val + "`"
index++
}
......@@ -173,6 +173,10 @@ func ReadDataFromSQLite(field model.DefField, dbName string, tableName string) (
selectCol := field.Select
from := dbName + "_" + tableName
where := field.Where
if where == "" {
where = "true"
}
if !strings.Contains(where, "LIMIT") {
total := vari.Total
if total > constant.MaxNumb { total = constant.MaxNumb }
......
无法预览此类型文件
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册