close task#7494

demo/smoke.yaml

@@ -26,12 +26,12 @@ fields:
     loopfix: "|"
     postfix: "\t"
 
-  - field: field6
+  - field: test6
     fields:
       - field: child1
         range: X-Z
-        prefix:
-        postfix: "\t"
+        prefix: "a'b"
+        postfix: "\t <:\"(`[]{}"
 
       - field: child2
         prefix: "["

src/action/generator.go

@@ -9,6 +9,7 @@ import (
 	constant "github.com/easysoft/zendata/src/utils/const"
 	i118Utils "github.com/easysoft/zendata/src/utils/i118"
 	logUtils "github.com/easysoft/zendata/src/utils/log"
+	stringUtils "github.com/easysoft/zendata/src/utils/string"
 	"github.com/easysoft/zendata/src/utils/vari"
 	"net/http"
 	"os"
@@ -59,27 +60,24 @@ func Print(rows [][]string, format string, out string, table string, colTypes []
 	for i, cols := range rows {
 		row := make([]string, 0)
 		rowXml := model.XmlRow{}
+		valuesForSql := make([]string, 0)
 		lineForText := ""
-		valuesForSql := ""
 
 		for j, col := range cols {
-			if j > 0 && format == constant.FormatSql {
-				valuesForSql = valuesForSql + ", "
-			}
 			lineForText = lineForText + col
 
 			row = append(row, col)
 			rowXml.Cols = append(rowXml.Cols, col)
 
-			colVal := col
+			colVal := stringUtils.ConvertForSql(col)
 			if !colTypes[j] { colVal = "'" + colVal + "'" }
-			valuesForSql = valuesForSql + colVal
+			valuesForSql = append(valuesForSql, colVal)
 		}
 
 		if format == constant.FormatText {
 			printLine(lineForText)
 		} else if format == constant.FormatSql {
-			printLine(genSqlLine(valuesForSql, i, len(rows)))
+			printLine(genSqlLine(strings.Join(valuesForSql, ", "), i, len(rows)))
 		} else if format == constant.FormatJson {
 			printLine(genJsonLine(i, row, len(rows), fields))
 		} else if format == constant.FormatXml {
@@ -132,6 +130,7 @@ func RowToJson(cols []string, fieldsToExport []string) string {
 
 
 func genSqlLine(valuesForSql string, i int, length int) string {
+
 	temp := ""
 	if i == 0 {
 		temp = fmt.Sprintf("  VALUES (%s)", valuesForSql)

src/utils/string/string.go

@@ -128,4 +128,27 @@ func AddPad(str string, field model.DefField) string {
 	}
 
 	return str
+}
+
+func ConvertForSql(str string) (ret string) {
+	arr := []rune(str)
+
+	count := 0
+	for _, item := range arr {
+		if count % 2 == 1 && string(item) != "'" {
+			ret = ret + "'"
+		}
+
+		if string(item) != "'" {
+			count = 0
+		}
+
+		ret = ret + string(item)
+
+		if string(item) == "'" {
+			count++
+		}
+	}
+
+	return
 }
\ No newline at end of file