Merge pull request #39 from nashtsai/master

make Import() call Db.Exec() directly
This commit is contained in:
lunny 2013-12-26 16:51:44 -08:00
commit 7d02fc2e35
1 changed files with 7 additions and 3 deletions

View File

@ -980,18 +980,22 @@ func (engine *Engine) Import(ddlPath string) ([]sql.Result, error) {
scanner.Split(semiColSpliter) scanner.Split(semiColSpliter)
session := engine.NewSession() session := engine.NewSession()
session.IsAutoClose = false defer session.Close()
err = session.newDb()
if err != nil {
return results, err
}
for scanner.Scan() { for scanner.Scan() {
query := scanner.Text() query := scanner.Text()
query = strings.Trim(query, " \t") query = strings.Trim(query, " \t")
if len(query) > 0 { if len(query) > 0 {
result, err := session.Exec(query) result, err := session.Db.Exec(query)
results = append(results, result) results = append(results, result)
if err != nil { if err != nil {
lastError = err lastError = err
} }
} }
} }
session.Close()
return results, lastError return results, lastError
} }