Revert "Put FilenameId in .bvfs_lsfiles output"

This reverts commit b5a9e41199297cefc8c1e0cffc8a188144a463ed.

diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c
index 0625f3f4ee00b7cefd4481eea07999b1ec2c3047..c6bfc525d363246bfe2e40434ad34f3afdd005ab 100644 (file)
--- a/bacula/src/cats/sql_cmds.c
+++ b/bacula/src/cats/sql_cmds.c
@@ -736,7 +736,7 @@ const char *sql_bvfs_select[] =
 };
 
 static const char *sql_bvfs_list_files_default =
-"SELECT 'F', T1.PathId, File.FilenameId, "
+"SELECT 'F', T1.PathId, Filename.Name, "
         "File.JobId, File.LStat, File.FileId "
 "FROM Job, File, ( "
     "SELECT MAX(JobTDate) AS JobTDate, PathId, FilenameId "
@@ -770,7 +770,7 @@ const char *sql_bvfs_list_files[] = {
 
    /* JobId PathId JobId PathId WHERE? Filename? Limit Offset*/
    /* Postgresql */
- "SELECT Type, PathId, FilenameId, JobId, LStat, FileId "
+ "SELECT Type, PathId, Name, JobId, LStat, FileId "
   "FROM ("
    "SELECT DISTINCT ON (FilenameId) 'F' as Type, PathId, T.FilenameId, "
     "Filename.Name, JobId, LStat, FileId, FileIndex "