Revise the functional options for statements

Author: jrauh01

database/delete.go

@@ -30,8 +30,6 @@ type DeleteStatement interface {
 	Table() string
 
 	Where() string
-
-	apply(do *deleteOptions)
 }
 
 // NewDeleteStatement returns a new deleteStatement for the given entity.
@@ -72,28 +70,21 @@ func (d *deleteStatement) Where() string {
 	return d.where
 }
 
-func (d *deleteStatement) apply(opts *deleteOptions) {
-	opts.stmt = d
-}
-
-// DeleteOption is the interface for functional options for DeleteStatement.
-type DeleteOption interface {
-	// apply applies the option to the given deleteOptions.
-	apply(*deleteOptions)
-}
-
-// DeleteOptionFunc is a function type that implements the DeleteOption interface.
-type DeleteOptionFunc func(opts *deleteOptions)
+// DeleteOption is a functional option for DeleteStreamed().
+type DeleteOption func(opts *deleteOptions)
 
-func (f DeleteOptionFunc) apply(opts *deleteOptions) {
-	f(opts)
+// WithDeleteStatement sets the DELETE statement to be used for deleting entities.
+func WithDeleteStatement(stmt DeleteStatement) DeleteOption {
+	return func(opts *deleteOptions) {
+		opts.stmt = stmt
+	}
 }
 
 // WithOnDelete sets the callbacks for a successful DELETE operation.
 func WithOnDelete(onDelete ...OnSuccess[any]) DeleteOption {
-	return DeleteOptionFunc(func(opts *deleteOptions) {
+	return func(opts *deleteOptions) {
 		opts.onDelete = onDelete
-	})
+	}
 }
 
 // deleteOptions stores the options for DeleteStreamed.
@@ -112,7 +103,7 @@ func DeleteStreamed(
 ) error {
 	opts := &deleteOptions{}
 	for _, option := range options {
-		option.apply(opts)
+		option(opts)
 	}
 
 	first, forward, err := com.CopyFirst(ctx, entities)

database/insert.go

@@ -26,9 +26,6 @@ type InsertStatement interface {
 
 	// ExcludedColumns returns the columns to be excluded from the INSERT statement.
 	ExcludedColumns() []string
-
-	// apply implements the InsertOption interface and applies itself to the given options.
-	apply(opts *insertOptions)
 }
 
 // NewInsertStatement returns a new insertStatement for the given entity.
@@ -80,10 +77,6 @@ func (i *insertStatement) ExcludedColumns() []string {
 	return i.excludedColumns
 }
 
-func (i *insertStatement) apply(opts *insertOptions) {
-	opts.stmt = i
-}
-
 // InsertSelectStatement is the interface for building INSERT SELECT statements.
 type InsertSelectStatement interface {
 	// Into sets the table name for the INSERT SELECT statement.
@@ -176,24 +169,21 @@ func (i *insertSelectStatement) Select() SelectStatement {
 	return i.selectStmt
 }
 
-// InsertOption is the interface for functional options for InsertStreamed.
-type InsertOption interface {
-	// apply applies the option to the given insertOptions.
-	apply(opts *insertOptions)
-}
+// InsertOption is a functional option for InsertStreamed().
+type InsertOption func(opts *insertOptions)
 
-// InsertOptionFunc is a function type that implements the InsertOption interface.
-type InsertOptionFunc func(opts *insertOptions)
-
-func (f InsertOptionFunc) apply(opts *insertOptions) {
-	f(opts)
+// WithInsertStatement sets the INSERT statement to be used for inserting entities.
+func WithInsertStatement(stmt InsertStatement) InsertOption {
+	return func(opts *insertOptions) {
+		opts.stmt = stmt
+	}
 }
 
 // WithOnInsert sets the onInsert callbacks for a successful INSERT statement.
 func WithOnInsert(onInsert ...OnSuccess[any]) InsertOption {
-	return InsertOptionFunc(func(opts *insertOptions) {
+	return func(opts *insertOptions) {
 		opts.onInsert = onInsert
-	})
+	}
 }
 
 // insertOptions stores the options for InsertStreamed.

database/update.go

@@ -32,9 +32,6 @@ type UpdateStatement interface {
 
 	// Where returns the where clause for the UPDATE statement.
 	Where() string
-
-	// apply implements the UpdateOption interface and applies itself to the given options.
-	apply(opts *updateOptions)
 }
 
 // NewUpdateStatement returns a new updateStatement for the given entity.
@@ -97,28 +94,21 @@ func (u *updateStatement) Where() string {
 	return u.where
 }
 
-func (u *updateStatement) apply(opts *updateOptions) {
-	opts.stmt = u
-}
-
-// UpdateOption is the interface for functional options for UpdateStatement.
-type UpdateOption interface {
-	// apply applies the option to the given updateOptions.
-	apply(opts *updateOptions)
-}
+// UpdateOption is a functional option for UpdateStreamed().
+type UpdateOption func(opts *updateOptions)
 
-// UpdateOptionFunc is a function type that implements the UpdateOption interface.
-type UpdateOptionFunc func(opts *updateOptions)
-
-func (f UpdateOptionFunc) apply(opts *updateOptions) {
-	f(opts)
+// WithUpdateStatement sets the UPDATE statement to be used for updating entities.
+func WithUpdateStatement(stmt UpdateStatement) UpdateOption {
+	return func(opts *updateOptions) {
+		opts.stmt = stmt
+	}
 }
 
 // WithOnUpdate sets the callback functions to be called after a successful UPDATE.
 func WithOnUpdate(onUpdate ...OnSuccess[any]) UpdateOption {
-	return UpdateOptionFunc(func(opts *updateOptions) {
+	return func(opts *updateOptions) {
 		opts.onUpdate = onUpdate
-	})
+	}
 }
 
 // updateOptions stores the options for UpdateStreamed.

database/upsert.go

@@ -35,9 +35,6 @@ type UpsertStatement interface {
 
 	// ExcludedColumns returns the columns to be excluded from the UPSERT statement.
 	ExcludedColumns() []string
-
-	// apply implements the UpsertOption interface and applies itself to the given options.
-	apply(opts *upsertOptions)
 }
 
 // NewUpsertStatement returns a new upsertStatement for the given entity.
@@ -89,28 +86,21 @@ func (u *upsertStatement) ExcludedColumns() []string {
 	return u.excludedColumns
 }
 
-func (u *upsertStatement) apply(opts *upsertOptions) {
-	opts.stmt = u
-}
-
-// UpsertOption is the interface for functional options for UpsertStreamed.
-type UpsertOption interface {
-	// apply applies the option to the given upsertOptions.
-	apply(opts *upsertOptions)
-}
-
-// UpsertOptionFunc is a function type that implements the UpsertOption interface.
-type UpsertOptionFunc func(opts *upsertOptions)
+// UpsertOption is a functional option for UpsertStreamed().
+type UpsertOption func(opts *upsertOptions)
 
-func (f UpsertOptionFunc) apply(opts *upsertOptions) {
-	f(opts)
+// WithUpsertStatement sets the UPSERT statement to be used for upserting entities.
+func WithUpsertStatement(stmt UpsertStatement) UpsertOption {
+	return func(opts *upsertOptions) {
+		opts.stmt = stmt
+	}
 }
 
 // WithOnUpsert sets the callback functions to be called after a successful UPSERT.
 func WithOnUpsert(onUpsert ...OnSuccess[any]) UpsertOption {
-	return UpsertOptionFunc(func(opts *upsertOptions) {
+	return func(opts *upsertOptions) {
 		opts.onUpsert = onUpsert
-	})
+	}
 }
 
 // upsertOptions stores the options for UpsertStreamed.
@@ -136,7 +126,7 @@ func UpsertStreamed[T any, V EntityConstraint[T]](
 	)
 
 	for _, option := range options {
-		option.apply(opts)
+		option(opts)
 	}
 
 	if opts.stmt != nil {

database/upsert_test.go

@@ -164,7 +164,7 @@ func TestUpsertStreamed(t *testing.T) {
 
 			go func() {
 				if tst.Data.Statement != nil {
-					upsertError = UpsertStreamed(ctx, db, entities, tst.Data.Statement)
+					upsertError = UpsertStreamed(ctx, db, entities, WithUpsertStatement(tst.Data.Statement))
 				} else {
 					upsertError = UpsertStreamed(ctx, db, entities)
 				}