Merge pull request #335 from BillBuilt/on-conflict-do-nothing-without…

…-conflict-target ON CONFLICT DO NOTHING without a conflict target is valid SQL
go-jet · Mar 24, 2024 · 60d8f15 · 60d8f15
2 parents 1b63280 + 0d250f5
commit 60d8f15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/postgres/clause.go b/postgres/clause.go
@@ -44,7 +44,7 @@ func (o *onConflictClause) DO_UPDATE(action conflictAction) InsertStatement {
 }
 
 func (o *onConflictClause) Serialize(statementType jet.StatementType, out *jet.SQLBuilder, options ...jet.SerializeOption) {
-	if len(o.indexExpressions) == 0 && o.constraint == "" {
+	if len(o.indexExpressions) == 0 && o.constraint == "" && o.do != jet.Keyword("DO NOTHING") {
 		return
 	}
 

diff --git a/postgres/clause_test.go b/postgres/clause_test.go
@@ -8,7 +8,8 @@ func TestOnConflict(t *testing.T) {
 
 	onConflict := &onConflictClause{}
 	onConflict.DO_NOTHING()
-	assertClauseSerialize(t, onConflict, "")
+	assertClauseSerialize(t, onConflict, `
+ON CONFLICT DO NOTHING`)
 
 	onConflict = &onConflictClause{indexExpressions: ColumnList{table1ColBool}}
 	onConflict.DO_NOTHING()