Move check for rows.Err as a last check.

neicnordic · Jan 7, 2025 · ecb2d59 · ecb2d59
1 parent 39707d9
commit ecb2d59
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/sda/internal/database/db_functions.go b/sda/internal/database/db_functions.go
@@ -732,9 +732,6 @@ func (dbs *SDAdb) getCorrID(user, path, accession string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	if rows.Err() != nil {
-		return "", rows.Err()
-	}
 	defer rows.Close()
 
 	var corrID sql.NullString
@@ -747,6 +744,9 @@ func (dbs *SDAdb) getCorrID(user, path, accession string) (string, error) {
 			return corrID.String, nil
 		}
 	}
+	if rows.Err() != nil {
+		return "", rows.Err()
+	}
 
 	return "", fmt.Errorf("sql: no rows in result set")
 }