merge /github/pull/835

Change-Id: Ib2e56c02ea1f98a5a47392ebbeeb6e88feb28e3c
cenkore · Aug 17, 2020 · e5dd582 · e5dd582
1 parent bf63ac9
commit e5dd582
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/go/logic/applier.go b/go/logic/applier.go
@@ -434,6 +434,8 @@ func (this *Applier) ReadMigrationMinValues(uniqueKey *sql.UniqueKey) error {
 		}
 	}
 	log.Infof("Migration min values: [%s]", this.migrationContext.MigrationRangeMinValues)
+
+	err = rows.Err()
 	return err
 }
 
@@ -463,6 +465,8 @@ func (this *Applier) ReadMigrationMaxValues(uniqueKey *sql.UniqueKey) error {
 		}
 	}
 	log.Infof("Migration max values: [%s]", this.migrationContext.MigrationRangeMaxValues)
+
+	err = rows.Err()
 	return err
 }
 
@@ -544,6 +548,11 @@ func (this *Applier) CalculateNextIterationRangeEndValues() (hasFurtherRange boo
 			}
 			hasFurtherRange = true
 		}
+
+		if err = rows.Err(); err != nil {
+			return hasFurtherRange, err
+		}
+
 		if hasFurtherRange {
 			this.migrationContext.MigrationIterationRangeMaxValues = iterationRangeMaxValues
 			return hasFurtherRange, nil