diff --git a/Apewer.Source/Source/SqlClient.cs b/Apewer.Source/Source/SqlClient.cs index d10edea..0b485f0 100644 --- a/Apewer.Source/Source/SqlClient.cs +++ b/Apewer.Source/Source/SqlClient.cs @@ -185,9 +185,9 @@ namespace Apewer.Source var values = new List(psc); foreach (var column in ps) { - //names.Add(TextGenerator.Merge("[", column, "]")); - names.Add(TextUtility.Merge(column)); - values.Add("@" + column); + + names.Add($"[{column.ParameterName}]"); + values.Add("@" + column.ParameterName); } var sb = new StringBuilder(); sb.Append("insert into ", table, "(", string.Join(", ", names.ToArray()), ") "); @@ -233,7 +233,7 @@ namespace Apewer.Source foreach (var p in ps) { var pn = p.ParameterName; - items.Add(TextUtility.Merge("[", pn, "] = @", pn)); + items.Add($"[{pn}] = @{pn}"); } var key = record.Key.SafeKey(); var sql = $"update {table} set {string.Join(", ", items.ToArray())} where [{structure.Key.Field}]='{key}'"; @@ -665,33 +665,33 @@ COLLATE Chinese_PRC_CI_AS type = "datetime"; break; case ColumnType.VarChar: - type = TextUtility.Merge("varchar(", Math.Min(8000, length).ToString(), ")"); + type = $"varchar({Math.Min(8000, length)})"; break; case ColumnType.VarChar191: - type = TextUtility.Merge("varchar(191)"); + type = "varchar(191)"; break; case ColumnType.VarCharMax: - type = TextUtility.Merge("varchar(max)"); + type = "varchar(max)"; break; case ColumnType.Text: - type = TextUtility.Merge("text"); + type = "text"; break; case ColumnType.NVarChar: - type = TextUtility.Merge("nvarchar(", Math.Min(4000, length).ToString(), ")"); + type = $"nvarchar({Math.Min(4000, length)})"; break; case ColumnType.NVarChar191: - type = TextUtility.Merge("nvarchar(191)"); + type = "nvarchar(191)"; break; case ColumnType.NVarCharMax: - type = TextUtility.Merge("nvarchar(max)"); + type = "nvarchar(max)"; break; case ColumnType.NText: - type = TextUtility.Merge("ntext"); + type = "ntext"; break; default: return TextUtility.Empty; } - return TextUtility.Merge("[", vcolumn.Field, "] ", type); + return $"[{vcolumn.Field}] {type}"; } #endregion