Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
| ... | ... |
@@ -131,8 +131,8 @@ func (db *Database) Set(fullPath, id string) (*Entity, error) {
|
| 131 | 131 |
if _, err := db.conn.Exec("BEGIN EXCLUSIVE"); err != nil {
|
| 132 | 132 |
return nil, err |
| 133 | 133 |
} |
| 134 |
- var entityId string |
|
| 135 |
- if err := db.conn.QueryRow("SELECT id FROM entity WHERE id = ?;", id).Scan(&entityId); err != nil {
|
|
| 134 |
+ var entityID string |
|
| 135 |
+ if err := db.conn.QueryRow("SELECT id FROM entity WHERE id = ?;", id).Scan(&entityID); err != nil {
|
|
| 136 | 136 |
if err == sql.ErrNoRows {
|
| 137 | 137 |
if _, err := db.conn.Exec("INSERT INTO entity (id) VALUES(?);", id); err != nil {
|
| 138 | 138 |
rollback() |
| ... | ... |
@@ -320,14 +320,14 @@ func (db *Database) RefPaths(id string) Edges {
|
| 320 | 320 |
|
| 321 | 321 |
for rows.Next() {
|
| 322 | 322 |
var name string |
| 323 |
- var parentId string |
|
| 324 |
- if err := rows.Scan(&name, &parentId); err != nil {
|
|
| 323 |
+ var parentID string |
|
| 324 |
+ if err := rows.Scan(&name, &parentID); err != nil {
|
|
| 325 | 325 |
return refs |
| 326 | 326 |
} |
| 327 | 327 |
refs = append(refs, &Edge{
|
| 328 | 328 |
EntityID: id, |
| 329 | 329 |
Name: name, |
| 330 |
- ParentID: parentId, |
|
| 330 |
+ ParentID: parentID, |
|
| 331 | 331 |
}) |
| 332 | 332 |
} |
| 333 | 333 |
return refs |
| ... | ... |
@@ -443,11 +443,11 @@ func (db *Database) children(e *Entity, name string, depth int, entities []WalkM |
| 443 | 443 |
defer rows.Close() |
| 444 | 444 |
|
| 445 | 445 |
for rows.Next() {
|
| 446 |
- var entityId, entityName string |
|
| 447 |
- if err := rows.Scan(&entityId, &entityName); err != nil {
|
|
| 446 |
+ var entityID, entityName string |
|
| 447 |
+ if err := rows.Scan(&entityID, &entityName); err != nil {
|
|
| 448 | 448 |
return nil, err |
| 449 | 449 |
} |
| 450 |
- child := &Entity{entityId}
|
|
| 450 |
+ child := &Entity{entityID}
|
|
| 451 | 451 |
edge := &Edge{
|
| 452 | 452 |
ParentID: e.id, |
| 453 | 453 |
Name: entityName, |
| ... | ... |
@@ -490,11 +490,11 @@ func (db *Database) parents(e *Entity) (parents []string, err error) {
|
| 490 | 490 |
defer rows.Close() |
| 491 | 491 |
|
| 492 | 492 |
for rows.Next() {
|
| 493 |
- var parentId string |
|
| 494 |
- if err := rows.Scan(&parentId); err != nil {
|
|
| 493 |
+ var parentID string |
|
| 494 |
+ if err := rows.Scan(&parentID); err != nil {
|
|
| 495 | 495 |
return nil, err |
| 496 | 496 |
} |
| 497 |
- parents = append(parents, parentId) |
|
| 497 |
+ parents = append(parents, parentID) |
|
| 498 | 498 |
} |
| 499 | 499 |
|
| 500 | 500 |
return parents, nil |