back interdiff of round #1 and #0

appview: directly inherit Repo on ResolvedRepo #392

merged
opened by boltless.me targeting master from boltless.me/core: ref/inherit-repo
  • reduce duplicated codes
  • possibly remove/refactor ResolvedRepo in future
  • allow accessing db.Repo after it is resolved
files
appview
db
issues
middleware
repo
reporesolver
state
ERROR
appview/issues/issues.go

Failed to calculate interdiff for this file.

REBASED
appview/middleware/middleware.go

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

ERROR
appview/repo/artifact.go

Failed to calculate interdiff for this file.

ERROR
appview/repo/index.go

Failed to calculate interdiff for this file.

REBASED
appview/reporesolver/resolver.go

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

REVERTED
appview/db/repos.go
···
var description, spindle sql.NullString
row := e.QueryRow(`
+
select did, name, knot, created, at_uri, description, spindle
-
select did, name, knot, created, at_uri, description, spindle, rkey
from repos
where did = ? and name = ?
`,
···
)
var createdAt string
+
if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.AtUri, &description, &spindle); err != nil {
-
if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.AtUri, &description, &spindle, &repo.Rkey); err != nil {
return nil, err
}
createdAtTime, _ := time.Parse(time.RFC3339, createdAt)
···
var repo Repo
var nullableDescription sql.NullString
+
row := e.QueryRow(`select did, name, knot, created, at_uri, description from repos where at_uri = ?`, atUri)
-
row := e.QueryRow(`select did, name, knot, created, at_uri, rkey, description from repos where at_uri = ?`, atUri)
var createdAt string
+
if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.AtUri, &nullableDescription); err != nil {
-
if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.AtUri, &repo.Rkey, &nullableDescription); err != nil {
return nil, err
}
createdAtTime, _ := time.Parse(time.RFC3339, createdAt)
···
}
func AddRepo(e Execer, repo *Repo) error {
-
if repo.AtUri == "" {
-
repo.AtUri = repo.RepoAt().String()
-
}
_, err := e.Exec(
`insert into repos
(did, name, knot, rkey, at_uri, description, source)
ERROR
appview/state/state.go

Failed to calculate interdiff for this file.

NEW
appview/db/star.go
···
r.name,
r.knot,
r.rkey,
-
r.created,
-
r.at_uri
+
r.created
from stars s
join repos r on s.repo_at = r.at_uri
`)
···
&repo.Knot,
&repo.Rkey,
&repoCreatedAt,
-
&repo.AtUri,
); err != nil {
return nil, err
}