fix(mysqldialect): remove duplicate AppendTime

uptrace · Oct 5, 2021 · 8d42090 · 8d42090
1 parent 182e4ee
commit 8d42090
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/dialect/mysqldialect/append.go b/dialect/mysqldialect/append.go
@@ -32,7 +32,7 @@ func appendTimeValue(fmter schema.Formatter, b []byte, v reflect.Value) []byte {
 
 func appendTime(b []byte, tm time.Time) []byte {
 	b = append(b, '\'')
-	b = tm.UTC().AppendFormat(b, "2006-01-02 15:04:05.999999")
+	b = tm.AppendFormat(b, "2006-01-02 15:04:05.999999")
 	b = append(b, '\'')
 	return b
 }

diff --git a/dialect/mysqldialect/dialect.go b/dialect/mysqldialect/dialect.go
@@ -85,10 +85,7 @@ func (d *Dialect) IdentQuote() byte {
 }
 
 func (d *Dialect) AppendTime(b []byte, tm time.Time) []byte {
-	b = append(b, '\'')
-	b = tm.AppendFormat(b, "2006-01-02 15:04:05.999999-07:00")
-	b = append(b, '\'')
-	return b
+	return appendTime(b, tm)
 }
 
 func (d *Dialect) Append(fmter schema.Formatter, b []byte, v interface{}) []byte {

diff --git a/internal/dbtest/query_test.go b/internal/dbtest/query_test.go
@@ -547,7 +547,7 @@ func TestQuery(t *testing.T) {
 		},
 		func(db *bun.DB) schema.QueryAppender {
 			type Model struct {
-				ID int `bun:",allowzero"`
+				ID int64 `bun:",allowzero"`
 			}
 			return db.NewInsert().Model(new(Model))
 		},
@@ -557,6 +557,13 @@ func TestQuery(t *testing.T) {
 		func(db *bun.DB) schema.QueryAppender {
 			return db.NewUpdate().Model(&Model{ID: 42}).OmitZero().WherePK()
 		},
+		func(db *bun.DB) schema.QueryAppender {
+			type Model struct {
+				ID   int64
+				Time time.Time
+			}
+			return db.NewInsert().Model(&Model{ID: 123, Time: time.Unix(0, 0)})
+		},
 	}
 
 	timeRE := regexp.MustCompile(`'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+(\+\d{2}:\d{2})?'`)

diff --git a/internal/dbtest/testdata/snapshots/TestQuery-mysql5-61 b/internal/dbtest/testdata/snapshots/TestQuery-mysql5-61
@@ -1 +1 @@
-VALUES ROW(NULL), ROW('1970-01-01 00:00:00+00:00')
+VALUES ROW(NULL), ROW('1970-01-01 00:00:00')
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-mysql5-88 b/internal/dbtest/testdata/snapshots/TestQuery-mysql5-88
@@ -1 +1 @@
-UPDATE `models` AS `model` SET  WHERE (`model`.`id` = 42)
+INSERT INTO `models` (`id`, `time`) VALUES (123, '1970-01-01 00:00:00')
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-mysql8-61 b/internal/dbtest/testdata/snapshots/TestQuery-mysql8-61
@@ -1 +1 @@
-VALUES ROW(NULL), ROW('1970-01-01 00:00:00+00:00')
+VALUES ROW(NULL), ROW('1970-01-01 00:00:00')
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-mysql8-88 b/internal/dbtest/testdata/snapshots/TestQuery-mysql8-88
@@ -1 +1 @@
-UPDATE `models` AS `model` SET  WHERE (`model`.`id` = 42)
+INSERT INTO `models` (`id`, `time`) VALUES (123, '1970-01-01 00:00:00')
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-pg-88 b/internal/dbtest/testdata/snapshots/TestQuery-pg-88
@@ -1 +1 @@
-UPDATE "models" AS "model" SET  WHERE ("model"."id" = 42)
+INSERT INTO "models" ("id", "time") VALUES (123, '1970-01-01 00:00:00+00:00')
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-pgx-88 b/internal/dbtest/testdata/snapshots/TestQuery-pgx-88
@@ -1 +1 @@
-UPDATE "models" AS "model" SET  WHERE ("model"."id" = 42)
+INSERT INTO "models" ("id", "time") VALUES (123, '1970-01-01 00:00:00+00:00')
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-sqlite-88 b/internal/dbtest/testdata/snapshots/TestQuery-sqlite-88
@@ -1 +1 @@
-UPDATE "models" AS "model" SET  WHERE ("model"."id" = 42)
+INSERT INTO "models" ("id", "time") VALUES (123, '1970-01-01 00:00:00+00:00')
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		VALUES ROW(NULL), ROW('1970-01-01 00:00:00+00:00')
		VALUES ROW(NULL), ROW('1970-01-01 00:00:00')
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		UPDATE `models` AS `model` SET WHERE (`model`.`id` = 42)
		INSERT INTO `models` (`id`, `time`) VALUES (123, '1970-01-01 00:00:00')
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		UPDATE "models" AS "model" SET WHERE ("model"."id" = 42)
		INSERT INTO "models" ("id", "time") VALUES (123, '1970-01-01 00:00:00+00:00')