Allow to optionally bind unnamed query params when yielding results

Author: yhabteab

pkg/icingadb/db.go

@@ -506,7 +506,9 @@ func (db *DB) BatchSizeByPlaceholders(n int) int {
 // YieldAll executes the query with the supplied scope,
 // scans each resulting row into an entity returned by the factory function,
 // and streams them into a returned channel.
-func (db *DB) YieldAll(ctx context.Context, factoryFunc contracts.EntityFactoryFunc, query string, scope interface{}) (<-chan contracts.Entity, <-chan error) {
+func (db *DB) YieldAll(
+	ctx context.Context, factoryFunc contracts.EntityFactoryFunc, query string, namedQueryParams bool, scope ...interface{},
+) (<-chan contracts.Entity, <-chan error) {
 	entities := make(chan contracts.Entity, 1)
 	g, ctx := errgroup.WithContext(ctx)
 
@@ -515,7 +517,14 @@ func (db *DB) YieldAll(ctx context.Context, factoryFunc contracts.EntityFactoryF
 		defer db.log(ctx, query, &counter).Stop()
 		defer close(entities)
 
-		rows, err := db.NamedQueryContext(ctx, query, scope)
+		var rows *sqlx.Rows
+		var err error
+		if namedQueryParams {
+			rows, err = db.NamedQueryContext(ctx, query, scope)
+		} else {
+			rows, err = db.QueryxContext(ctx, query, scope...)
+		}
+
 		if err != nil {
 			return internal.CantPerformQuery(err, query)
 		}

pkg/icingadb/sync.go

@@ -85,7 +85,8 @@ func (s Sync) Sync(ctx context.Context, subject *common.SyncSubject) error {
 
 	actual, dbErrs := s.db.YieldAll(
 		ctx, subject.FactoryForDelta(),
-		s.db.BuildSelectStmt(NewScopedEntity(subject.Entity(), e.Meta()), subject.Entity().Fingerprint()), e.Meta(),
+		s.db.BuildSelectStmt(NewScopedEntity(subject.Entity(), e.Meta()), subject.Entity().Fingerprint()),
+		true, e.Meta(),
 	)
 	// Let errors from DB cancel our group.
 	com.ErrgroupReceive(g, dbErrs)
@@ -187,7 +188,8 @@ func (s Sync) SyncCustomvars(ctx context.Context) error {
 
 	actualCvs, errs := s.db.YieldAll(
 		ctx, cv.FactoryForDelta(),
-		s.db.BuildSelectStmt(NewScopedEntity(cv.Entity(), e.Meta()), cv.Entity().Fingerprint()), e.Meta(),
+		s.db.BuildSelectStmt(NewScopedEntity(cv.Entity(), e.Meta()), cv.Entity().Fingerprint()),
+		true, e.Meta(),
 	)
 	com.ErrgroupReceive(g, errs)
 
@@ -199,7 +201,8 @@ func (s Sync) SyncCustomvars(ctx context.Context) error {
 
 	actualFlatCvs, errs := s.db.YieldAll(
 		ctx, flatCv.FactoryForDelta(),
-		s.db.BuildSelectStmt(NewScopedEntity(flatCv.Entity(), e.Meta()), flatCv.Entity().Fingerprint()), e.Meta(),
+		s.db.BuildSelectStmt(NewScopedEntity(flatCv.Entity(), e.Meta()), flatCv.Entity().Fingerprint()),
+		true, e.Meta(),
 	)
 	com.ErrgroupReceive(g, errs)