Overhaul database package

go/buildbot/db.go

 package buildbot
 
 import (
         "database/sql"
         "encoding/json"
         "fmt"
 )
 
 // build from the database.
 func GetCommitsForBuild(master, builder string, buildNumber int) ([]string, error) {
@@ skipping 123 matching lines @@
         if err != nil {
                 return fmt.Errorf("Failed to delete build steps from database: %v", err)
         }
         // Actually insert the steps.
         insertStepStmt, err := tx.Preparex(fmt.Sprintf("REPLACE INTO %s (builder,master,buildNumber,name,results,number,started,finished) VALUES (?,?,?,?,?,?,?,?);", TABLE_BUILD_STEPS))
         if err != nil {
                 return fmt.Errorf("Unable to push buildsteps into database - Could not prepare statement: %v", err)
         }
         defer insertStepStmt.Close()
         for _, s := range b.Steps {
-                _, err = insertStepStmt.Exec(s.BuilderName, s.MasterName, s.BuildNumber, s.Name, s.Results, s.Number, s.Started, s.Finished)
+                _, err = insertStepStmt.Exec(b.BuilderName, b.MasterName, b.Number, s.Name, s.Results, s.Number, s.Started, s.Finished)
                 if err != nil {
-                        return fmt.Errorf("Failed to push build into database: %v", err)
+                        return fmt.Errorf("Failed to push build step into database: %v", err)
                 }
 
         }
 
         // Commits.
 
         // First, delete existing revisions so that we don't have leftovers
         // hanging around from before.
         delCmtsStmt, err := tx.Preparex(fmt.Sprintf("DELETE FROM %s WHERE master = ? AND builder = ? AND number = ?;", TABLE_BUILD_REVISIONS))
         if err != nil {
@@ skipping 47 matching lines @@
         if err != nil {
                 return nil, fmt.Errorf("Unable to retrieve unfinished builds - Could not prepare statement: %v", err)
         }
         defer stmt.Close()
         b := []*Build{}
         if err = stmt.Select(&b); err != nil {
                 return nil, fmt.Errorf("Unable to retrieve unfinished builds: %v", err)
         }
         return b, nil
 }