appview/db: return ids in a few places #592

appview/db/db.go

This patch was likely rebased, as context lines do not match.

appview/db/pulls.go

This file has not been changed.

+8 -8

appview/db/repos.go

··· 403 403 var repos []models.Repo 404 404 405 405 rows, err := e.Query( 406 406 - `select distinct r.id, r.did, r.name, r.knot, r.rkey, r.description, r.created, r.source 406 406 + `select distinct r.did, r.name, r.knot, r.rkey, r.description, r.created, r.source 407 407 from repos r 408 408 left join collaborators c on r.at_uri = c.repo_at 409 409 where (r.did = ? or c.subject_did = ?) ··· 416 416 var repos []models.Repo 417 417 418 418 rows, err := e.Query( 419 419 - `select distinct r.did, r.name, r.knot, r.rkey, r.description, r.created, r.source 419 419 + `select distinct r.id, r.did, r.name, r.knot, r.rkey, r.description, r.created, r.source 420 420 from repos r 421 421 left join collaborators c on r.at_uri = c.repo_at 422 422 where (r.did = ? or c.subject_did = ?) 423 423 var nullableDescription sql.NullString 424 424 var nullableSource sql.NullString 425 425 426 426 - err := rows.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 426 426 + err := rows.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 427 427 if err != nil { 428 428 return nil, err 429 429 } ··· 436 436 var nullableDescription sql.NullString 437 437 var nullableSource sql.NullString 438 438 439 439 - err := rows.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 439 439 + err := rows.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 440 440 if err != nil { 441 441 return nil, err 442 442 } ··· 460 460 var nullableSource sql.NullString 461 461 462 462 row := e.QueryRow( 463 463 - `select id, did, name, knot, rkey, description, created, source 463 463 + `select did, name, knot, rkey, description, created, source 464 464 from repos 465 465 where did = ? and name = ? and source is not null and source != ''`, 466 466 did, name, 467 467 ) 468 468 469 469 - err := row.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 469 469 + err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 470 470 if err != nil { 471 471 return nil, err 472 472 } 473 473 var nullableSource sql.NullString 474 474 475 475 row := e.QueryRow( 476 476 - `select did, name, knot, rkey, description, created, source 476 476 + `select id, did, name, knot, rkey, description, created, source 477 477 from repos 478 478 where did = ? and name = ? and source is not null and source != ''`, 479 479 did, name, 480 480 ) 481 481 482 482 - err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 482 482 + err := row.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 483 483 if err != nil { 484 484 return nil, err 485 485 }

appview/notify/db/db.go

This file has not been changed.

appview/state/state.go

This file has not been changed.