JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/satellitedb,multinode/multinodedb: update to latest dbx

Browse Source 
Change-Id: I500df6d0541706c3960d4560721c3783d0d049ff
This commit is contained in:
Egon Elbre 2023-09-11 17:19:19 +03:00 committed by Storj Robot
parent 8edb9c5f98
commit 487f64e164
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multinode/multinodedb/dbx/gen.sh
View File

@ -2,7 +2,7 @@
set -e pipefail set -e pipefail
dbx schema -d pgx -d sqlite3 multinodedb.dbx . dbx schema -d pgx -d sqlite3 multinodedb.dbx .
dbx golang -d pgx -d sqlite3 --rx=false -p dbx -t templates multinodedb.dbx . dbx golang -d pgx -d sqlite3 -p dbx -t templates multinodedb.dbx .
( printf '%s\n' '//lint:file-ignore U1000,ST1012,SA1019 generated file'; cat multinodedb.dbx.go ) > multinodedb.dbx.go.tmp && mv multinodedb.dbx.go.tmp multinodedb.dbx.go ( printf '%s\n' '//lint:file-ignore U1000,ST1012,SA1019 generated file'; cat multinodedb.dbx.go ) > multinodedb.dbx.go.tmp && mv multinodedb.dbx.go.tmp multinodedb.dbx.go
gofmt -r "*sql.Tx -> tagsql.Tx" -w multinodedb.dbx.go gofmt -r "*sql.Tx -> tagsql.Tx" -w multinodedb.dbx.go

2
satellite/satellitedb/dbx/gen/main.go
View File

@ -35,7 +35,7 @@ func main() {
fmt.Println("schema out", string(schemaOut)) fmt.Println("schema out", string(schemaOut))
log.Fatal(err) log.Fatal(err)
} }
gogenArgs := append([]string{"golang", "--rx=false", "-d=pgx", "-d=pgxcockroach", "-p=dbx", "-t=templates"}, files...) gogenArgs := append([]string{"golang", "-d=pgx", "-d=pgxcockroach", "-p=dbx", "-t=templates"}, files...)
gogenOut, err := exec.Command("dbx", gogenArgs...).CombinedOutput() gogenOut, err := exec.Command("dbx", gogenArgs...).CombinedOutput()
if err != nil { if err != nil {
fmt.Println("gogen out", string(gogenOut)) fmt.Println("gogen out", string(gogenOut))

1
satellite/satellitedb/dbx/satellitedb.dbx.go
View File

@ -205,7 +205,6 @@ func (obj *DB) Open(ctx context.Context) (*Tx, error) {
txMethods: obj.wrapTx(tx), txMethods: obj.wrapTx(tx),
}, nil }, nil
} }
func DeleteAll(ctx context.Context, db *DB) (int64, error) { func DeleteAll(ctx context.Context, db *DB) (int64, error) {
tx, err := db.Open(ctx) tx, err := db.Open(ctx)
if err != nil { if err != nil {

5
satellite/satellitedb/dbx/templates/golang.header.tmpl
View File

@ -207,11 +207,6 @@ func (obj *DB) Open(ctx context.Context) (*Tx, error) {
txMethods: obj.wrapTx(tx), txMethods: obj.wrapTx(tx),
}, nil }, nil
} }
{{ if $options.SupportRx }}
func (obj *DB) NewRx() *Rx {
return &Rx{db: obj}
}
{{ end }}
func DeleteAll(ctx context.Context, db *DB) (int64, error) { func DeleteAll(ctx context.Context, db *DB) (int64, error) {
tx, err := db.Open(ctx) tx, err := db.Open(ctx)
if err != nil { if err != nil {