wpetit
/
super-graph
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue with prepared statements skipped on error

This commit is contained in:
Vikram Rangnekar 2020-03-31 01:28:39 -04:00
parent d96eaf14f4
commit 68a378c00f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
serv/prepare.go
View File

@ -83,12 +83,6 @@ func prepareStmt(item allow.Item) error {
qt := qcode.GetQType(gql) qt := qcode.GetQType(gql)
q := []byte(gql) q := []byte(gql)
if len(vars) == 0 {
logger.Debug().Msgf("Prepared statement:\n%s\n", gql)
} else {
logger.Debug().Msgf("Prepared statement:\n%s\n%s\n", vars, gql)
}
tx, err := db.Begin(context.Background()) tx, err := db.Begin(context.Background())
if err != nil { if err != nil {
return err return err
@ -110,7 +104,7 @@ func prepareStmt(item allow.Item) error {
return err return err
} }
logger.Debug().Msg("Prepared statement role: user") logger.Debug().Msgf("Prepared statement 'query %s' (user)", item.Name)
err = prepare(tx, stmts1, stmtHash(item.Name, "user")) err = prepare(tx, stmts1, stmtHash(item.Name, "user"))
if err != nil { if err != nil {
@ -118,7 +112,7 @@ func prepareStmt(item allow.Item) error {
} }
if conf.isAnonRoleDefined() { if conf.isAnonRoleDefined() {
logger.Debug().Msg("Prepared statement for role: anon") logger.Debug().Msgf("Prepared statement 'query %s' (anon)", item.Name)
stmts2, err := buildRoleStmt(q, vars, "anon") stmts2, err := buildRoleStmt(q, vars, "anon")
if err == psql.ErrAllTablesSkipped { if err == psql.ErrAllTablesSkipped {
@ -136,11 +130,17 @@ func prepareStmt(item allow.Item) error {
case qcode.QTMutation: case qcode.QTMutation:
for _, role := range conf.Roles { for _, role := range conf.Roles {
logger.Debug().Msgf("Prepared statement for role: %s", role.Name) logger.Debug().Msgf("Prepared statement 'mutation %s' (%s)", item.Name, role.Name)
stmts, err := buildRoleStmt(q, vars, role.Name) stmts, err := buildRoleStmt(q, vars, role.Name)
if err != nil { if err != nil {
return err if len(item.Vars) == 0 {
logger.Warn().Err(err).Msg(item.Query)
} else {
logger.Warn().Err(err).Msgf("%s %s", item.Vars, item.Query)
}
continue
} }
err = prepare(tx, stmts, stmtHash(item.Name, role.Name)) err = prepare(tx, stmts, stmtHash(item.Name, role.Name))