|
|
|
@@ -25,7 +25,7 @@ var _ repository.SiteRepository = (*SQLiteSiteRepository)(nil)
|
|
|
|
|
|
|
|
|
|
func (r *SQLiteSiteRepository) GetSite(id string) (*models.Site, error) {
|
|
|
|
|
row := r.db.QueryRow(`
|
|
|
|
|
SELECT id, git_server, owner, repository, branch, domain, deploy_token, enabled, not_found_file
|
|
|
|
|
SELECT id, name, git_server, owner, repository, branch, domain, deploy_token, enabled, not_found_file
|
|
|
|
|
FROM sites WHERE id = ?`, id)
|
|
|
|
|
|
|
|
|
|
s, err := scanSite(row)
|
|
|
|
@@ -41,7 +41,7 @@ func (r *SQLiteSiteRepository) GetSite(id string) (*models.Site, error) {
|
|
|
|
|
|
|
|
|
|
func (r *SQLiteSiteRepository) GetSiteByDomain(domain string) (*models.Site, error) {
|
|
|
|
|
row := r.db.QueryRow(`
|
|
|
|
|
SELECT id, git_server, owner, repository, branch, domain, deploy_token, enabled, not_found_file
|
|
|
|
|
SELECT id, name, git_server, owner, repository, branch, domain, deploy_token, enabled, not_found_file
|
|
|
|
|
FROM sites WHERE domain = ?`, domain)
|
|
|
|
|
|
|
|
|
|
s, err := scanSite(row)
|
|
|
|
@@ -60,7 +60,7 @@ func (r *SQLiteSiteRepository) GetSiteByDomain(domain string) (*models.Site, err
|
|
|
|
|
|
|
|
|
|
func (r *SQLiteSiteRepository) ListSites() ([]models.Site, error) {
|
|
|
|
|
rows, err := r.db.Query(`
|
|
|
|
|
SELECT id, git_server, owner, repository, branch, domain, deploy_token, enabled, not_found_file
|
|
|
|
|
SELECT id, name, git_server, owner, repository, branch, domain, deploy_token, enabled, not_found_file
|
|
|
|
|
FROM sites`)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, fmt.Errorf("list sites: %w", err)
|
|
|
|
@@ -98,9 +98,9 @@ func (r *SQLiteSiteRepository) CreateSite(s *models.Site) error {
|
|
|
|
|
s.ID = uuid.NewString()
|
|
|
|
|
|
|
|
|
|
_, err = tx.Exec(`
|
|
|
|
|
INSERT INTO sites (id, git_server, owner, repository, branch, domain, deploy_token, enabled, not_found_file)
|
|
|
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
|
|
|
|
s.ID, s.GitServer, s.Owner, s.Repository, s.Branch,
|
|
|
|
|
INSERT INTO sites (id, name, git_server, owner, repository, branch, domain, deploy_token, enabled, not_found_file)
|
|
|
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
|
|
|
|
s.ID, s.Name, s.GitServer, s.Owner, s.Repository, s.Branch,
|
|
|
|
|
s.Domain, s.DeployToken, s.Enabled, s.NotFoundFile,
|
|
|
|
|
)
|
|
|
|
|
if err != nil {
|
|
|
|
@@ -130,9 +130,9 @@ func (r *SQLiteSiteRepository) UpdateSite(s *models.Site) error {
|
|
|
|
|
defer tx.Rollback()
|
|
|
|
|
|
|
|
|
|
_, err = tx.Exec(`
|
|
|
|
|
UPDATE sites SET git_server=?, owner=?, repository=?, branch=?, domain=?,
|
|
|
|
|
UPDATE sites SET name=?, git_server=?, owner=?, repository=?, branch=?, domain=?,
|
|
|
|
|
deploy_token=?, enabled=?, not_found_file=? WHERE id=?`,
|
|
|
|
|
s.GitServer, s.Owner, s.Repository, s.Branch, s.Domain,
|
|
|
|
|
s.Name, s.GitServer, s.Owner, s.Repository, s.Branch, s.Domain,
|
|
|
|
|
s.DeployToken, s.Enabled, s.NotFoundFile, s.ID,
|
|
|
|
|
)
|
|
|
|
|
if err != nil {
|
|
|
|
@@ -333,7 +333,7 @@ func scanSite(s scanner) (*models.Site, error) {
|
|
|
|
|
var site models.Site
|
|
|
|
|
var enabled int
|
|
|
|
|
err := s.Scan(
|
|
|
|
|
&site.ID, &site.GitServer, &site.Owner, &site.Repository,
|
|
|
|
|
&site.ID, &site.Name, &site.GitServer, &site.Owner, &site.Repository,
|
|
|
|
|
&site.Branch, &site.Domain, &site.DeployToken, &enabled, &site.NotFoundFile,
|
|
|
|
|
)
|
|
|
|
|
if err != nil {
|
|
|
|
|