Merge pull request #64 from ShiftLeftSecurity/allow-returning-for-insertmulti

Michal Sitko · web-flow · commit f239b5c6b452 · 2022-12-23T12:15:02.000+01:00
Allow returning for insertmulti
diff --git a/db/chain/expressions.go b/db/chain/expressions.go
@@ -130,7 +130,7 @@ func (ec *ExpressionChain) OnConflict(clause func(*OnConflict)) *ExpressionChain
 // in many scenarios.
 func (ec *ExpressionChain) Returning(args ...string) *ExpressionChain {
 	if ec.mainOperation == nil ||
-		(ec.mainOperation.segment != sqlInsert && ec.mainOperation.segment != sqlUpdate) {
+		(ec.mainOperation.segment != sqlInsert && ec.mainOperation.segment != sqlInsertMulti && ec.mainOperation.segment != sqlUpdate) {
 		ec.err = append(ec.err, errors.New("Returning is only valid on UPDATE and INSERT statements"))
 	}
 	ec.append(

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func (ec ExpressionChain) OnConflict(clause func(OnConflict)) *ExpressionChain`
`130`	`130`	`// in many scenarios.`
`131`	`131`	`func (ec ExpressionChain) Returning(args ...string) ExpressionChain {`
`132`	`132`	`if ec.mainOperation == nil \|\|`
`133`		`- (ec.mainOperation.segment != sqlInsert && ec.mainOperation.segment != sqlUpdate) {`
	`133`	`+ (ec.mainOperation.segment != sqlInsert && ec.mainOperation.segment != sqlInsertMulti && ec.mainOperation.segment != sqlUpdate) {`
`134`	`134`	`ec.err = append(ec.err, errors.New("Returning is only valid on UPDATE and INSERT statements"))`
`135`	`135`	`}`
`136`	`136`	`ec.append(`