Add error if exists after parse raw query results, fix go-gorm#1398

leeopus · Mar 24, 2017 · 66d5b42 · 66d5b42
1 parent 5730b92
commit 66d5b42
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/callback_query_preload.go b/callback_query_preload.go
@@ -310,6 +310,10 @@ func (scope *Scope) handleManyToManyPreload(field *Field, conditions []interface
 		}
 	}
 
+	if err := rows.Err(); err != nil {
+		scope.Err(err)
+	}
+
 	// assign find results
 	var (
 		indirectScopeValue = scope.IndirectValue()

diff --git a/scope.go b/scope.go
@@ -930,6 +930,10 @@ func (scope *Scope) pluck(column string, value interface{}) *Scope {
 			scope.Err(rows.Scan(elem))
 			dest.Set(reflect.Append(dest, reflect.ValueOf(elem).Elem()))
 		}
+
+		if err := rows.Err(); err != nil {
+			scope.Err(err)
+		}
 	}
 	return scope
 }