Skip to content

Commit c852b61

Browse files
js-ojusjs-ojus
committed
Correct tx variable shadowing error throughout the code base
1 parent a4bc409 commit c852b61

File tree

10 files changed

+108
-73
lines changed

10 files changed

+108
-73
lines changed

‎access_context.go‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ func (_AccessContexts) New(otx *sql.Tx, name string) (AccessContextID, error) {
8787
}
8888

8989
var tx *sql.Tx
90+
var err error
9091
if otx == nil {
91-
tx, err := db.Begin()
92+
tx, err = db.Begin()
9293
if err != nil {
9394
return 0, err
9495
}
@@ -296,8 +297,9 @@ func (_AccessContexts) Rename(otx *sql.Tx, id AccessContextID, name string) erro
296297
}
297298

298299
var tx *sql.Tx
300+
var err error
299301
if otx == nil {
300-
tx, err := db.Begin()
302+
tx, err = db.Begin()
301303
if err != nil {
302304
return err
303305
}
@@ -311,7 +313,7 @@ func (_AccessContexts) Rename(otx *sql.Tx, id AccessContextID, name string) erro
311313
SET name = ?
312314
WHERE id = ?
313315
`
314-
_, err := tx.Exec(q, name, id)
316+
_, err = tx.Exec(q, name, id)
315317
if err != nil {
316318
return err
317319
}
@@ -335,8 +337,9 @@ func (_AccessContexts) SetActive(otx *sql.Tx, id AccessContextID, active bool) e
335337
}
336338

337339
var tx *sql.Tx
340+
var err error
338341
if otx == nil {
339-
tx, err := db.Begin()
342+
tx, err = db.Begin()
340343
if err != nil {
341344
return err
342345
}
@@ -350,7 +353,7 @@ func (_AccessContexts) SetActive(otx *sql.Tx, id AccessContextID, active bool) e
350353
SET active = ?
351354
WHERE id = ?
352355
`
353-
_, err := tx.Exec(q, act, id)
356+
_, err = tx.Exec(q, act, id)
354357
if err != nil {
355358
return err
356359
}
@@ -445,8 +448,9 @@ func (_AccessContexts) AddGroupRole(otx *sql.Tx, id AccessContextID, gid GroupID
445448
}
446449

447450
var tx *sql.Tx
451+
var err error
448452
if otx == nil {
449-
tx, err := db.Begin()
453+
tx, err = db.Begin()
450454
if err != nil {
451455
return err
452456
}
@@ -455,7 +459,7 @@ func (_AccessContexts) AddGroupRole(otx *sql.Tx, id AccessContextID, gid GroupID
455459
tx = otx
456460
}
457461

458-
_, err := tx.Exec(`INSERT INTO wf_ac_group_roles(ac_id, group_id, role_id) VALUES(?, ?, ?)`, id, gid, rid)
462+
_, err = tx.Exec(`INSERT INTO wf_ac_group_roles(ac_id, group_id, role_id) VALUES(?, ?, ?)`, id, gid, rid)
459463
if err != nil {
460464
return err
461465
}
@@ -477,8 +481,9 @@ func (_AccessContexts) RemoveGroupRole(otx *sql.Tx, id AccessContextID, gid Grou
477481
}
478482

479483
var tx *sql.Tx
484+
var err error
480485
if otx == nil {
481-
tx, err := db.Begin()
486+
tx, err = db.Begin()
482487
if err != nil {
483488
return err
484489
}
@@ -487,7 +492,7 @@ func (_AccessContexts) RemoveGroupRole(otx *sql.Tx, id AccessContextID, gid Grou
487492
tx = otx
488493
}
489494

490-
_, err := tx.Exec(`DELETE FROM wf_ac_group_roles WHERE ac_id = ? AND group_id = ? AND role_id = ?`, id, gid, rid)
495+
_, err = tx.Exec(`DELETE FROM wf_ac_group_roles WHERE ac_id = ? AND group_id = ? AND role_id = ?`, id, gid, rid)
491496
if err != nil {
492497
return err
493498
}
@@ -552,8 +557,9 @@ func (_AccessContexts) AddGroup(otx *sql.Tx, id AccessContextID, gid, reportsTo
552557
}
553558

554559
var tx *sql.Tx
560+
var err error
555561
if otx == nil {
556-
tx, err := db.Begin()
562+
tx, err = db.Begin()
557563
if err != nil {
558564
return err
559565
}
@@ -563,7 +569,7 @@ func (_AccessContexts) AddGroup(otx *sql.Tx, id AccessContextID, gid, reportsTo
563569
}
564570

565571
q := `INSERT INTO wf_ac_group_hierarchy(ac_id, group_id, reports_to) VALUES (?, ?, ?)`
566-
_, err := tx.Exec(q, id, gid, reportsTo)
572+
_, err = tx.Exec(q, id, gid, reportsTo)
567573
if err != nil {
568574
return err
569575
}
@@ -585,8 +591,9 @@ func (_AccessContexts) DeleteGroup(otx *sql.Tx, id AccessContextID, gid GroupID)
585591
}
586592

587593
var tx *sql.Tx
594+
var err error
588595
if otx == nil {
589-
tx, err := db.Begin()
596+
tx, err = db.Begin()
590597
if err != nil {
591598
return err
592599
}
@@ -596,7 +603,7 @@ func (_AccessContexts) DeleteGroup(otx *sql.Tx, id AccessContextID, gid GroupID)
596603
}
597604

598605
q := `DELETE FROM wf_ac_group_hierarchy WHERE ac_id = ? AND group_id = ?`
599-
_, err := tx.Exec(q, id, gid)
606+
_, err = tx.Exec(q, id, gid)
600607
if err != nil {
601608
return err
602609
}
@@ -669,8 +676,9 @@ func (_AccessContexts) ChangeReporting(otx *sql.Tx, id AccessContextID, gid, rep
669676
}
670677

671678
var tx *sql.Tx
679+
var err error
672680
if otx == nil {
673-
tx, err := db.Begin()
681+
tx, err = db.Begin()
674682
if err != nil {
675683
return err
676684
}
@@ -685,7 +693,7 @@ func (_AccessContexts) ChangeReporting(otx *sql.Tx, id AccessContextID, gid, rep
685693
WHERE ac_id = ?
686694
AND group_id = ?
687695
`
688-
_, err := tx.Exec(q, reportsTo, id, gid)
696+
_, err = tx.Exec(q, reportsTo, id, gid)
689697
if err != nil {
690698
return err
691699
}

‎docaction.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ func (_DocActions) New(otx *sql.Tx, name string, reconfirm bool) (DocActionID, e
6262
}
6363

6464
var tx *sql.Tx
65+
var err error
6566
if otx == nil {
66-
tx, err := db.Begin()
67+
tx, err = db.Begin()
6768
if err != nil {
6869
return 0, err
6970
}
@@ -73,7 +74,6 @@ func (_DocActions) New(otx *sql.Tx, name string, reconfirm bool) (DocActionID, e
7374
}
7475

7576
var res sql.Result
76-
var err error
7777
if reconfirm {
7878
res, err = tx.Exec("INSERT INTO wf_docactions_master(name, reconfirm) VALUES(?, ?)", name, 1)
7979
} else {
@@ -182,8 +182,9 @@ func (_DocActions) Rename(otx *sql.Tx, id DocActionID, name string) error {
182182
}
183183

184184
var tx *sql.Tx
185+
var err error
185186
if otx == nil {
186-
tx, err := db.Begin()
187+
tx, err = db.Begin()
187188
if err != nil {
188189
return err
189190
}
@@ -192,7 +193,7 @@ func (_DocActions) Rename(otx *sql.Tx, id DocActionID, name string) error {
192193
tx = otx
193194
}
194195

195-
_, err := tx.Exec("UPDATE wf_docactions_master SET name = ? WHERE id = ?", name, id)
196+
_, err = tx.Exec("UPDATE wf_docactions_master SET name = ? WHERE id = ?", name, id)
196197
if err != nil {
197198
return err
198199
}

‎docevent.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,9 @@ func (_DocEvents) New(otx *sql.Tx, input *DocEventsNewInput) (DocEventID, error)
108108
}
109109

110110
var tx *sql.Tx
111+
var err error
111112
if otx == nil {
112-
tx, err := db.Begin()
113+
tx, err = db.Begin()
113114
if err != nil {
114115
return 0, err
115116
}

‎docstate.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ func (_DocStates) New(otx *sql.Tx, name string) (DocStateID, error) {
5757
}
5858

5959
var tx *sql.Tx
60+
var err error
6061
if otx == nil {
61-
tx, err := db.Begin()
62+
tx, err = db.Begin()
6263
if err != nil {
6364
return 0, err
6465
}
@@ -177,8 +178,9 @@ func (_DocStates) Rename(otx *sql.Tx, id DocStateID, name string) error {
177178
}
178179

179180
var tx *sql.Tx
181+
var err error
180182
if otx == nil {
181-
tx, err := db.Begin()
183+
tx, err = db.Begin()
182184
if err != nil {
183185
return err
184186
}
@@ -187,7 +189,7 @@ func (_DocStates) Rename(otx *sql.Tx, id DocStateID, name string) error {
187189
tx = otx
188190
}
189191

190-
_, err := tx.Exec("UPDATE wf_docstates_master SET name = ? WHERE id = ?", name, id)
192+
_, err = tx.Exec("UPDATE wf_docstates_master SET name = ? WHERE id = ?", name, id)
191193
if err != nil {
192194
return err
193195
}

‎doctype.go‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ func (_DocTypes) New(otx *sql.Tx, name string) (DocTypeID, error) {
7171
}
7272

7373
var tx *sql.Tx
74+
var err error
7475
if otx == nil {
75-
tx, err := db.Begin()
76+
tx, err = db.Begin()
7677
if err != nil {
7778
return 0, err
7879
}
@@ -211,8 +212,9 @@ func (_DocTypes) Rename(otx *sql.Tx, id DocTypeID, name string) error {
211212
}
212213

213214
var tx *sql.Tx
215+
var err error
214216
if otx == nil {
215-
tx, err := db.Begin()
217+
tx, err = db.Begin()
216218
if err != nil {
217219
return err
218220
}
@@ -221,7 +223,7 @@ func (_DocTypes) Rename(otx *sql.Tx, id DocTypeID, name string) error {
221223
tx = otx
222224
}
223225

224-
_, err := tx.Exec("UPDATE wf_doctypes_master SET name = ? WHERE id = ?", name, id)
226+
_, err = tx.Exec("UPDATE wf_doctypes_master SET name = ? WHERE id = ?", name, id)
225227
if err != nil {
226228
return err
227229
}
@@ -342,8 +344,9 @@ func (_DocTypes) _Transitions(dtype DocTypeID, state DocStateID) (map[DocActionI
342344
func (_DocTypes) AddTransition(otx *sql.Tx, dtype DocTypeID, state DocStateID,
343345
action DocActionID, toState DocStateID) error {
344346
var tx *sql.Tx
347+
var err error
345348
if otx == nil {
346-
tx, err := db.Begin()
349+
tx, err = db.Begin()
347350
if err != nil {
348351
return err
349352
}
@@ -356,7 +359,7 @@ func (_DocTypes) AddTransition(otx *sql.Tx, dtype DocTypeID, state DocStateID,
356359
INSERT INTO wf_docstate_transitions(doctype_id, from_state_id, docaction_id, to_state_id)
357360
VALUES(?, ?, ?, ?)
358361
`
359-
_, err := tx.Exec(q, dtype, state, action, toState)
362+
_, err = tx.Exec(q, dtype, state, action, toState)
360363
if err != nil {
361364
return err
362365
}
@@ -375,8 +378,9 @@ func (_DocTypes) AddTransition(otx *sql.Tx, dtype DocTypeID, state DocStateID,
375378
// document action performed on documents in the given current state.
376379
func (_DocTypes) RemoveTransition(otx *sql.Tx, dtype DocTypeID, state DocStateID, action DocActionID) error {
377380
var tx *sql.Tx
381+
var err error
378382
if otx == nil {
379-
tx, err := db.Begin()
383+
tx, err = db.Begin()
380384
if err != nil {
381385
return err
382386
}
@@ -391,7 +395,7 @@ func (_DocTypes) RemoveTransition(otx *sql.Tx, dtype DocTypeID, state DocStateID
391395
AND from_state_id =?
392396
AND docaction_id = ?
393397
`
394-
_, err := tx.Exec(q, dtype, state, action)
398+
_, err = tx.Exec(q, dtype, state, action)
395399
if err != nil {
396400
return err
397401
}

‎document.go‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ func (_Documents) New(otx *sql.Tx, input *DocumentsNewInput) (DocumentID, error)
220220

221221
var tx *sql.Tx
222222
if otx == nil {
223-
tx, err := db.Begin()
223+
tx, err = db.Begin()
224224
if err != nil {
225225
return 0, err
226226
}
@@ -490,7 +490,7 @@ func (_Documents) SetTitle(otx *sql.Tx, dtype DocTypeID, id DocumentID, title st
490490

491491
var tx *sql.Tx
492492
if otx == nil {
493-
tx, err := db.Begin()
493+
tx, err = db.Begin()
494494
if err != nil {
495495
return err
496496
}
@@ -523,8 +523,9 @@ func (_Documents) SetData(otx *sql.Tx, dtype DocTypeID, id DocumentID, data stri
523523
tbl := DocTypes.docStorName(dtype)
524524

525525
var tx *sql.Tx
526+
var err error
526527
if otx == nil {
527-
tx, err := db.Begin()
528+
tx, err = db.Begin()
528529
if err != nil {
529530
return err
530531
}
@@ -534,7 +535,7 @@ func (_Documents) SetData(otx *sql.Tx, dtype DocTypeID, id DocumentID, data stri
534535
}
535536

536537
q := `UPDATE ` + tbl + ` SET data = ?, ctime = NOW() WHERE id = ?`
537-
_, err := tx.Exec(q, data, id)
538+
_, err = tx.Exec(q, data, id)
538539
if err != nil {
539540
return err
540541
}
@@ -667,7 +668,7 @@ func (_Documents) AddBlob(otx *sql.Tx, dtype DocTypeID, id DocumentID, blob *Blo
667668

668669
var tx *sql.Tx
669670
if otx == nil {
670-
tx, err := db.Begin()
671+
tx, err = db.Begin()
671672
if err != nil {
672673
return err
673674
}
@@ -705,8 +706,9 @@ func (_Documents) DeleteBlob(otx *sql.Tx, dtype DocTypeID, id DocumentID, sha1 s
705706
}
706707

707708
var tx *sql.Tx
709+
var err error
708710
if otx == nil {
709-
tx, err := db.Begin()
711+
tx, err = db.Begin()
710712
if err != nil {
711713
return err
712714
}
@@ -722,7 +724,7 @@ func (_Documents) DeleteBlob(otx *sql.Tx, dtype DocTypeID, id DocumentID, sha1 s
722724
`
723725
var count int64
724726
row := tx.QueryRow(q, sha1)
725-
err := row.Scan(&count)
727+
err = row.Scan(&count)
726728
if err != nil {
727729
return err
728730
}
@@ -826,7 +828,7 @@ func (_Documents) AddTags(otx *sql.Tx, dtype DocTypeID, id DocumentID, tags ...s
826828

827829
var tx *sql.Tx
828830
if otx == nil {
829-
tx, err := db.Begin()
831+
tx, err = db.Begin()
830832
if err != nil {
831833
return err
832834
}
@@ -869,8 +871,9 @@ func (_Documents) RemoveTag(otx *sql.Tx, dtype DocTypeID, id DocumentID, tag str
869871
tag = strings.ToLower(tag)
870872

871873
var tx *sql.Tx
874+
var err error
872875
if otx == nil {
873-
tx, err := db.Begin()
876+
tx, err = db.Begin()
874877
if err != nil {
875878
return err
876879
}
@@ -886,7 +889,7 @@ func (_Documents) RemoveTag(otx *sql.Tx, dtype DocTypeID, id DocumentID, tag str
886889
AND doc_id = ?
887890
AND tag = ?
888891
`
889-
_, err := tx.Exec(q, dtype, id, tag)
892+
_, err = tx.Exec(q, dtype, id, tag)
890893
if err != nil {
891894
return err
892895
}

0 commit comments

Comments
 (0)