From 22d17b6759c38d025f9aa07bca5bf623b04262b9 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 24 May 2017 18:33:43 +0200 Subject: [PATCH] Revert "Put FilenameId in .bvfs_lsfiles output" This reverts commit b5a9e41199297cefc8c1e0cffc8a188144a463ed. --- bacula/src/cats/sql_cmds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c index 0625f3f4ee..c6bfc525d3 100644 --- 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 " -- 2.39.5