Merge pull request #1342 from eirikbell/master

stephenafamo · web-flow · commit 3d37435dc44e · 2024-01-18T10:20:41.000Z
fix: revert #1322 fixing bug in v4.16.0
diff --git a/drivers/sqlboiler-psql/driver/override/main/singleton/psql_upsert.go.tpl b/drivers/sqlboiler-psql/driver/override/main/singleton/psql_upsert.go.tpl
@@ -33,8 +33,8 @@ func buildUpsertQueryPostgres(dia drivers.Dialect, tableName string, updateOnCon
 
 	columns := "DEFAULT VALUES"
 	if len(whitelist) != 0 {
-		columns = fmt.Sprintf("(\"%s\") VALUES (%s)",
-			strings.Join(whitelist, "\",\""),
+		columns = fmt.Sprintf("(%s) VALUES (%s)",
+			strings.Join(whitelist, ", "),
 			strmangle.Placeholders(dia.UseIndexPlaceholders, len(whitelist), 1, 1))
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ func buildUpsertQueryPostgres(dia drivers.Dialect, tableName string, updateOnCon`
`33`	`33`
`34`	`34`	`columns := "DEFAULT VALUES"`
`35`	`35`	`if len(whitelist) != 0 {`
`36`		`- columns = fmt.Sprintf("(\"%s\") VALUES (%s)",`
`37`		`- strings.Join(whitelist, "\",\""),`
	`36`	`+ columns = fmt.Sprintf("(%s) VALUES (%s)",`
	`37`	`+ strings.Join(whitelist, ", "),`
`38`	`38`	`strmangle.Placeholders(dia.UseIndexPlaceholders, len(whitelist), 1, 1))`
`39`	`39`	`}`
`40`	`40`