feat: support InsertQuery.Ignore on PostgreSQL

uptrace · Nov 23, 2021 · 1aa9d14 · 1aa9d14
1 parent b4cdd9d
commit 1aa9d14
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/dialect/feature/feature.go b/dialect/feature/feature.go
@@ -17,5 +17,7 @@ const (
 	TableCascade
 	TableIdentity
 	TableTruncate
-	OnDuplicateKey
+	InsertOnConflict     // INSERT ... ON CONFLICT
+	InsertOnDuplicateKey // INSERT ... ON DUPLICATE KEY
+	InsertIgnore         // INSERT IGNORE ...
 )
diff --git a/dialect/mysqldialect/dialect.go b/dialect/mysqldialect/dialect.go
@@ -33,7 +33,8 @@ func New() *Dialect {
 		feature.UpdateMultiTable |
 		feature.ValuesRow |
 		feature.TableTruncate |
-		feature.OnDuplicateKey
+		feature.InsertIgnore |
+		feature.InsertOnDuplicateKey
 	return d
 }
 

diff --git a/dialect/pgdialect/dialect.go b/dialect/pgdialect/dialect.go
@@ -31,7 +31,8 @@ func New() *Dialect {
 		feature.DeleteTableAlias |
 		feature.TableCascade |
 		feature.TableIdentity |
-		feature.TableTruncate
+		feature.TableTruncate |
+		feature.InsertOnConflict
 	return d
 }
 

diff --git a/dialect/sqlitedialect/dialect.go b/dialect/sqlitedialect/dialect.go
@@ -23,7 +23,8 @@ func New() *Dialect {
 	d.features = feature.CTE |
 		feature.Returning |
 		feature.InsertTableAlias |
-		feature.DeleteTableAlias
+		feature.DeleteTableAlias |
+		feature.InsertOnConflict
 	return d
 }
 

diff --git a/internal/dbtest/testdata/snapshots/TestQuery-pg-54 b/internal/dbtest/testdata/snapshots/TestQuery-pg-54
@@ -1 +1 @@
-INSERT IGNORE INTO "models" ("id", "str") VALUES (DEFAULT, '') RETURNING "id"
+INSERT INTO "models" AS "model" ("id", "str") VALUES (DEFAULT, '') ON CONFLICT DO NOTHING RETURNING "id"
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-pgx-54 b/internal/dbtest/testdata/snapshots/TestQuery-pgx-54
@@ -1 +1 @@
-INSERT IGNORE INTO "models" ("id", "str") VALUES (DEFAULT, '') RETURNING "id"
+INSERT INTO "models" AS "model" ("id", "str") VALUES (DEFAULT, '') ON CONFLICT DO NOTHING RETURNING "id"
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-sqlite-54 b/internal/dbtest/testdata/snapshots/TestQuery-sqlite-54
@@ -1 +1 @@
-INSERT IGNORE INTO "models" ("str") VALUES ('') RETURNING "id"
+INSERT INTO "models" AS "model" ("str") VALUES ('') ON CONFLICT DO NOTHING RETURNING "id"
diff --git a/query_insert.go b/query_insert.go
@@ -133,9 +133,16 @@ func (q *InsertQuery) hasReturning() bool {
 
 //------------------------------------------------------------------------------
 
-// Ignore generates an `INSERT IGNORE INTO` query (MySQL).
+// Ignore generates different queries depending on the DBMS:
+//   - On MySQL, it generates `INSERT IGNORE INTO`.
+//   - On PostgreSQL, it generates `ON CONFLICT DO NOTHING`.
 func (q *InsertQuery) Ignore() *InsertQuery {
-	q.ignore = true
+	if q.db.fmter.HasFeature(feature.InsertOnConflict) {
+		return q.On("CONFLICT DO NOTHING")
+	}
+	if q.db.fmter.HasFeature(feature.InsertIgnore) {
+		q.ignore = true
+	}
 	return q
 }
 
@@ -421,7 +428,7 @@ func (q *InsertQuery) appendOn(fmter schema.Formatter, b []byte) (_ []byte, err
 	}
 
 	if len(q.set) > 0 {
-		if fmter.HasFeature(feature.OnDuplicateKey) {
+		if fmter.HasFeature(feature.InsertOnDuplicateKey) {
 			b = append(b, ' ')
 		} else {
 			b = append(b, " SET "...)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		INSERT IGNORE INTO "models" ("id", "str") VALUES (DEFAULT, '') RETURNING "id"
		INSERT INTO "models" AS "model" ("id", "str") VALUES (DEFAULT, '') ON CONFLICT DO NOTHING RETURNING "id"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		INSERT IGNORE INTO "models" ("str") VALUES ('') RETURNING "id"
		INSERT INTO "models" AS "model" ("str") VALUES ('') ON CONFLICT DO NOTHING RETURNING "id"