From 00ede8b543cc2369dc64ee4883dd9fbfa0199367 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 8 Jul 2020 20:45:50 +0800 Subject: [PATCH] fix test --- engine.go | 7 ++++++- integrations/engine_test.go | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/engine.go b/engine.go index 682353c9..b9e17fff 100644 --- a/engine.go +++ b/engine.go @@ -424,10 +424,15 @@ func formatColumnValue(dstDialect dialects.Dialect, d interface{}, col *schemas. return "0" } - if col.SQLType.IsText() || col.SQLType.IsTime() { + if col.SQLType.IsText() { + var v = fmt.Sprintf("%s", d) + return "'" + strings.Replace(v, "'", "''", -1) + "'" + } else if col.SQLType.IsTime() { var v = fmt.Sprintf("%s", d) if strings.HasSuffix(v, " +0000 UTC") { return fmt.Sprintf("'%s'", v[0:len(v)-len(" +0000 UTC")]) + } else if strings.HasSuffix(v, " +0000 +0000") { + return fmt.Sprintf("'%s'", v[0:len(v)-len(" +0000 +0000")]) } return "'" + strings.Replace(v, "'", "''", -1) + "'" } else if col.SQLType.IsBlob() { diff --git a/integrations/engine_test.go b/integrations/engine_test.go index 73107b96..0e5d3424 100644 --- a/integrations/engine_test.go +++ b/integrations/engine_test.go @@ -101,13 +101,15 @@ func TestDump(t *testing.T) { assertSync(t, new(TestDumpStruct)) - testEngine.Insert([]TestDumpStruct{ + cnt, err := testEngine.Insert([]TestDumpStruct{ {Name: "1", IsMan: true}, {Name: "2\n"}, {Name: "3;"}, {Name: "4\n;\n''"}, {Name: "5'\n"}, }) + assert.NoError(t, err) + assert.EqualValues(t, 5, cnt) fp := fmt.Sprintf("%v.sql", testEngine.Dialect().URI().DBType) os.Remove(fp) @@ -118,7 +120,7 @@ func TestDump(t *testing.T) { sess := testEngine.NewSession() defer sess.Close() assert.NoError(t, sess.Begin()) - _, err := sess.ImportFile(fp) + _, err = sess.ImportFile(fp) assert.NoError(t, err) assert.NoError(t, sess.Commit())