Add parent_file_id and protect against null values

dmwm · Mar 2, 2022 · e4dea81 · e4dea81
1 parent 00473bd
commit e4dea81
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/dbs/blockdump.go b/dbs/blockdump.go
@@ -403,10 +403,19 @@ func getFileParentList(blk string, wg *sync.WaitGroup, fileParentList *FileParen
 	defer rows.Close()
 	for rows.Next() {
 		fileParent := FileParentRecord{}
+		var pid sql.NullInt64
+		var pfn sql.NullString
 		err = rows.Scan(
 			&fileParent.LogicalFileName,
-			&fileParent.ParentLogicalFileName,
+			&pid,
+			&pfn,
 		)
+		if pid.Valid {
+			fileParent.ParentFileId = pid.Int64
+		}
+		if pfn.Valid {
+			fileParent.ParentLogicalFileName = pfn.String
+		}
 		if err != nil {
 			log.Println("unable to scan rows", err)
 			return

diff --git a/dbs/fileparents.go b/dbs/fileparents.go
@@ -368,6 +368,7 @@ func (a *API) InsertFileParentsBlockTxt(tx *sql.Tx) error {
 // used by bulkblock API
 type FileParentRecord struct {
 	LogicalFileName       string `json:"this_logical_file_name"`
+	ParentFileId          int64  `json:"parent_file_id"`
 	ParentLogicalFileName string `json:"parent_logical_file_name"`
 }
 

diff --git a/static/sql/blockdump_fileparents.sql b/static/sql/blockdump_fileparents.sql
@@ -1,5 +1,6 @@
 SELECT
     F.LOGICAL_FILE_NAME,
+    PF.FILE_ID,
     PF.LOGICAL_FILE_NAME
 FROM {{.Owner}}.FILES PF
 JOIN {{.Owner}}.FILE_PARENTS FP ON FP.PARENT_FILE_ID = PF.FILE_ID