forked from tangled.org/core
Monorepo for Tangled — https://tangled.org

appview: db/repos: remove `AtUri` from `Repo`

sqlite db still has `at_uri` column to easily use as reference

Signed-off-by: Seongmin Lee <boltlessengineer@proton.me>

Changed files
+10 -16
appview
+9 -13
appview/db/repos.go
···
Knot string
Rkey string
Created time.Time
-
AtUri string
Description string
Spindle string
···
var description, spindle sql.NullString
row := e.QueryRow(`
-
select did, name, knot, created, at_uri, description, spindle, rkey
+
select did, name, knot, created, 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, &repo.Rkey); err != nil {
+
if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt, &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, rkey, description from repos where at_uri = ?`, atUri)
+
row := e.QueryRow(`select did, name, knot, created, rkey, description from repos where at_uri = ?`, atUri)
var createdAt string
-
if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.AtUri, &repo.Rkey, &nullableDescription); err != nil {
+
if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt, &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)
values (?, ?, ?, ?, ?, ?, ?)`,
-
repo.Did, repo.Name, repo.Knot, repo.Rkey, repo.AtUri, repo.Description, repo.Source,
+
repo.Did, repo.Name, repo.Knot, repo.Rkey, repo.RepoAt().String(), repo.Description, repo.Source,
)
return err
}
···
var repos []Repo
rows, err := e.Query(
-
`select did, name, knot, rkey, description, created, at_uri, source
+
`select did, name, knot, rkey, description, created, source
from repos
where did = ? and source is not null and source != ''
order by created desc`,
···
var nullableDescription sql.NullString
var nullableSource sql.NullString
-
err := rows.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &repo.AtUri, &nullableSource)
+
err := rows.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource)
if err != nil {
return nil, err
}
···
var nullableSource sql.NullString
row := e.QueryRow(
-
`select did, name, knot, rkey, description, created, at_uri, source
+
`select did, name, knot, rkey, description, created, source
from repos
where did = ? and name = ? and source is not null and source != ''`,
did, name,
)
-
err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &repo.AtUri, &nullableSource)
+
err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource)
if err != nil {
return nil, err
}
+1 -3
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
}