Skip to content

Commit 842cdc8

Browse files
authored
Merge pull request #1 from gofs-cli/chore/update-base-template
chore: update base template
2 parents 9b2b4ed + 4a30e66 commit 842cdc8

File tree

17 files changed

+38
-16
lines changed

17 files changed

+38
-16
lines changed

internal/db/db.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"database/sql"
66
"fmt"
7+
"time"
78

89
"github.com/gofs-cli/azure-app-template/internal/db/migrations"
910
)
@@ -24,6 +25,27 @@ func (d *DB) Close(ctx context.Context) error {
2425
return d.closeFn()
2526
}
2627

28+
func (d *DB) Transaction(ctx context.Context, f func(tx *sql.Tx) error) error {
29+
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
30+
defer cancel()
31+
32+
tx, err := d.conn.BeginTx(ctx, nil)
33+
if err != nil {
34+
return err
35+
}
36+
37+
err = f(tx)
38+
if err != nil {
39+
rollback_err := tx.Rollback()
40+
if rollback_err != nil {
41+
return fmt.Errorf("transaction error: %w, rollback err: %w", err, rollback_err)
42+
}
43+
return err
44+
}
45+
46+
return tx.Commit()
47+
}
48+
2749
func LocalPG(dsn string) (DB, error) {
2850
sDb, err := sql.Open("pgx", dsn)
2951
if err != nil {

internal/ui/components/header/header_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ui/components/modal/modal_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ui/components/toast/toast_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ui/index_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ui/pages/active-search/index_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ui/pages/bulk-update/index_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ui/pages/click-to-edit/index_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ui/pages/click-to-load/index_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ui/pages/delete-row/index_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)