finish setup data insertion, add world insertion
This commit is contained in:
@@ -2,14 +2,19 @@ package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
"golang.org/x/sync/errgroup"
|
||||
)
|
||||
|
||||
type Pack struct {
|
||||
ID string
|
||||
ID uint
|
||||
|
||||
Key string
|
||||
Name string
|
||||
Label string
|
||||
Banner string
|
||||
@@ -25,21 +30,26 @@ type Pack struct {
|
||||
|
||||
func (p *Pack) Query(data *InsertId[string]) {
|
||||
data.query = fmt.Sprintf(`
|
||||
INSERT INTO pack (%s, id, name, label, banner, path, type, system, package_type, package_name)
|
||||
INSERT INTO pack (%s, key_, name, label, banner, path, type, system, package_type, package_name)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
|
||||
RETURNING id`, data.fieldName)
|
||||
}
|
||||
|
||||
func (p *Pack) InsertObjects(tx *sqlx.Tx) error {
|
||||
relId := &InsertId[string]{id: p.ID, fieldName: "pack_id"}
|
||||
syncDB := NewSyncDB()
|
||||
defer close(syncDB.errChan)
|
||||
group, ctx := errgroup.WithContext(context.Background())
|
||||
|
||||
InsertWithCtxParallel(syncDB, tx, p.Ownership, relId)
|
||||
InsertSliceParallel(syncDB, tx, p.Index, relId)
|
||||
InsertSliceParallel(syncDB, tx, p.Folders, relId)
|
||||
InsertWithCtxParallel(group, ctx, tx, p.Ownership,
|
||||
InsertId[string]{id: strconv.FormatUint(uint64(p.ID), 10), fieldName: "pack_id"})
|
||||
|
||||
return syncDB.Wait()
|
||||
relId := InsertId[uint]{id: p.ID, fieldName: "pack_id"}
|
||||
InsertSliceParallel(group, tx, p.Index, relId)
|
||||
InsertSliceParallel(group, tx, p.Folders, relId)
|
||||
|
||||
err := group.Wait()
|
||||
if err != nil && !errors.Is(err, sql.ErrNoRows) {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *Pack) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
|
||||
@@ -47,9 +57,9 @@ func (p *Pack) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
|
||||
return ErrNoQuery
|
||||
}
|
||||
|
||||
args := []any{data.id, p.ID, p.Name, p.Label, p.Banner, p.Path, p.Type, p.System, p.PackageType, p.PackageName}
|
||||
args := []any{data.id, p.Key, p.Name, p.Label, p.Banner, p.Path, p.Type, p.System, p.PackageType, p.PackageName}
|
||||
|
||||
_, err := tx.Exec(data.query, args...)
|
||||
err := tx.QueryRowx(data.query, args...).Scan(&p.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -62,9 +72,9 @@ func (p *Pack) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string
|
||||
return ErrNoQuery
|
||||
}
|
||||
|
||||
args := []any{data.id, p.ID, p.Name, p.Label, p.Banner, p.Path, p.Type, p.System, p.PackageType, p.PackageName}
|
||||
args := []any{data.id, p.Key, p.Name, p.Label, p.Banner, p.Path, p.Type, p.System, p.PackageType, p.PackageName}
|
||||
|
||||
_, err := tx.ExecContext(ctx, data.query, args...)
|
||||
err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&p.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -82,13 +92,13 @@ type PackFolder struct {
|
||||
Sort int
|
||||
}
|
||||
|
||||
func (p *PackFolder) Query(data *InsertId[string]) {
|
||||
func (p *PackFolder) Query(data *InsertId[uint]) {
|
||||
data.query = fmt.Sprintf(`
|
||||
INSERT INTO pack_folder (%s, id, description, name, sorting, type, sort)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7)`, data.fieldName)
|
||||
}
|
||||
|
||||
func (p *PackFolder) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
|
||||
func (p *PackFolder) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
|
||||
if data.query == "" {
|
||||
return ErrNoQuery
|
||||
}
|
||||
@@ -103,7 +113,7 @@ func (p *PackFolder) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *PackFolder) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
|
||||
func (p *PackFolder) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
|
||||
if data.query == "" {
|
||||
return ErrNoQuery
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user