added support for 1 to 1 relations and added support for n unique key… #3

Merged
tiger5226 merged 2 commits from merge_changes into master 2019-02-08 01:51:36 +01:00
Showing only changes of commit 29172e976b - Show all commits

View file

@ -100,7 +100,7 @@ func deleteOneToManyConflictsBeforeMerge(tx boil.Executor, conflict conflictingU
// used in the delete query.
colNames, err := rows.Columns()
if err != nil {
log.Fatal(err)
return errors.Err(err)
}
//Each row result of the query needs to be removed for being a conflicting row. Store each row's keys in an array.
var rowsToRemove = [][]interface{}(nil)