diff --git a/dbs/blockdump.go b/dbs/blockdump.go index 613d89bf..29635e13 100644 --- 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 index 5a9ae6f4..77250fa0 100644 --- 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 index 4dae5616..8c8a7c7e 100644 --- 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