internal/{etl,postgres}: change ModuleVersionState.GoModPath to string type

Change-Id: I38209749ed8e82b4065188033d829f169d272e10
Reviewed-on: https://team-review.git.corp.google.com/c/golang/discovery/+/672058
CI-Result: Cloud Build <devtools-proctor-result-processor@system.gserviceaccount.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/internal/postgres/versionstate.go b/internal/postgres/versionstate.go
index bf1095de..c3d8176c 100644
--- a/internal/postgres/versionstate.go
+++ b/internal/postgres/versionstate.go
@@ -28,9 +28,9 @@ func (db *DB) InsertIndexVersions(ctx context.Context, versions []*internal.Inde
 
 	var vals []interface{}
 	for _, v := range versions {
-		vals = append(vals, v.Path, v.Version, version.ForSorting(v.Version), v.Timestamp, 0, "")
+		vals = append(vals, v.Path, v.Version, version.ForSorting(v.Version), v.Timestamp, 0, "", "")
 	}
-	cols := []string{"module_path", "version", "sort_version", "index_timestamp", "status", "error"}
+	cols := []string{"module_path", "version", "sort_version", "index_timestamp", "status", "error", "go_mod_path"}
 	conflictAction := `
 		ON CONFLICT
 			(module_path, version)
@@ -195,16 +195,11 @@ func scanModuleVersionState(scan func(dest ...interface{}) error) (*internal.Mod
 	var (
 		v               internal.ModuleVersionState
 		lastProcessedAt pq.NullTime
-		goModPath       sql.NullString
 	)
 	if err := scan(&v.ModulePath, &v.Version, &v.IndexTimestamp, &v.CreatedAt, &v.Status, &v.Error,
-		&v.TryCount, &v.LastProcessedAt, &v.NextProcessedAfter, &v.AppVersion, &goModPath); err != nil {
+		&v.TryCount, &v.LastProcessedAt, &v.NextProcessedAfter, &v.AppVersion, &v.GoModPath); err != nil {
 		return nil, err
 	}
-	if goModPath.Valid {
-		s := goModPath.String
-		v.GoModPath = &s
-	}
 	if lastProcessedAt.Valid {
 		lp := lastProcessedAt.Time
 		v.LastProcessedAt = &lp