Merge branch 'master' into lunny/join_support_tablename

This commit is contained in:
Lunny Xiao 2018-04-08 17:06:53 +08:00 committed by GitHub
commit c6c5933a15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -168,7 +168,7 @@ func (m *Migrate) runMigration(migration *Migration) error {
return ErrMissingID
}
run, err :=m.migrationDidRun(migration)
run, err := m.migrationDidRun(migration)
if err != nil {
return err
}

View File

@ -229,4 +229,4 @@ func TestQueryWithBuilder(t *testing.T) {
results, err := testEngine.Query(builder.Select("*").From("query_with_builder"))
assert.NoError(t, err)
assertResult(t, results)
}
}