Skip to content

Commit

Permalink
Fix errors being inaccessible due to errors being set on different *D…
Browse files Browse the repository at this point in the history
…B instance than what is returned.
  • Loading branch information
jaytaylor committed Jun 23, 2015
1 parent dbedca4 commit c2c1dd1
Showing 1 changed file with 17 additions and 11 deletions.
28 changes: 17 additions & 11 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -396,28 +396,33 @@ func (s *DB) AutoMigrate(values ...interface{}) *DB {
}

func (s *DB) ModifyColumn(column string, typ string) *DB {
s.clone().NewScope(s.Value).modifyColumn(column, typ)
return s
scope := s.clone().NewScope(s.Value)
scope.modifyColumn(column, typ)
return scope.db
}

func (s *DB) DropColumn(column string) *DB {
s.clone().NewScope(s.Value).dropColumn(column)
return s
scope := s.clone().NewScope(s.Value)
scope.dropColumn(column)
return scope.db
}

func (s *DB) AddIndex(indexName string, column ...string) *DB {
s.clone().NewScope(s.Value).addIndex(false, indexName, column...)
return s
scope := s.clone().NewScope(s.Value)
scope.addIndex(false, indexName, column...)
return scope.db
}

func (s *DB) AddUniqueIndex(indexName string, column ...string) *DB {
s.clone().NewScope(s.Value).addIndex(true, indexName, column...)
return s
scope := s.clone().NewScope(s.Value)
scope.addIndex(true, indexName, column...)
return scope.db
}

func (s *DB) RemoveIndex(indexName string) *DB {
s.clone().NewScope(s.Value).removeIndex(indexName)
return s
scope := s.clone().NewScope(s.Value)
scope.removeIndex(indexName)
return scope.db
}

/*
Expand All @@ -427,7 +432,8 @@ Example:
db.Model(&User{}).AddForeignKey("city_id", "cities(id)", "RESTRICT", "RESTRICT")
*/
func (s *DB) AddForeignKey(field string, dest string, onDelete string, onUpdate string) *DB {
s.clone().NewScope(s.Value).addForeignKey(field, dest, onDelete, onUpdate)
scope := s.clone().NewScope(s.Value)
scope.addForeignKey(field, dest, onDelete, onUpdate)
return s
}

Expand Down

0 comments on commit c2c1dd1

Please sign in to comment.