Cleanup code, pass err to scanFinish (go-rel#283)

aligator · May 27, 2022 · 6ddb27e · 6ddb27e
1 parent e3cd023
commit 6ddb27e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/cursor.go b/cursor.go
@@ -81,7 +81,6 @@ func scanMulti(cur Cursor, keyField string, keyType reflect.Type, cols map[inter
 	}
 
 	if !found && fields != nil {
-		// TODO: why a panic and not just an easily catchable error?
 		panic("rel: primary key row does not exists")
 	}
 

diff --git a/repository.go b/repository.go
@@ -1030,8 +1030,7 @@ func (r repository) preload(cw contextWrapper, records slice, field string, quer
 		path                                             = strings.Split(field, ".")
 		targets, table, keyField, keyType, ddata, loaded = r.mapPreloadTargets(records, path)
 		ids                                              = r.targetIDs(targets)
-
-		inClauseLength = 999 // TODO: can this value come from the adapter, as it is dbms specific?
+		inClauseLength                                   = 999
 	)
 
 	// Create separate queries if the amount of ids is more than inClauseLength.
@@ -1064,7 +1063,7 @@ func (r repository) preload(cw contextWrapper, records slice, field string, quer
 
 		scanFinish := r.instrumenter.Observe(cw.ctx, "rel-scan-multi", "scanning all records to multiple targets")
 		err = scanMulti(cur, keyField, keyType, targets)
-		scanFinish(nil)
+		scanFinish(err)
 		if err != nil {
 			return err
 		}