dbcopy: renamed dbconvert -> dbcopy

core/debian/bareos-database-tools.install.in

@@ -1,5 +1,5 @@
 /usr/sbin/bareos-dbcheck
-/usr/sbin/bareos-dbconvert
+/usr/sbin/bareos-dbcopy
 /usr/sbin/bscan
 /usr/share/man/man8/bareos-dbcheck.8*
 /usr/share/man/man8/bscan.8*

core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-tools

@@ -1,6 +1,6 @@
 
 sbin/bareos-dbcheck
-sbin/bareos-dbconvert
+sbin/bareos-dbcopy
 sbin/bscan
 man/man8/bareos-dbcheck.8.gz
 man/man8/bscan.8.gz

core/platforms/packaging/bareos.spec

@@ -481,7 +481,7 @@ Provides:   %{name}-database-backend
 %endif
 
 %package    database-tools
-Summary:    Bareos CLI tools with database dependencies (bareos-dbcheck, bareos-dbconvert, bscan)
+Summary:    Bareos CLI tools with database dependencies (bareos-dbcheck, bareos-dbcopy, bscan)
 Group:      Productivity/Archiving/Backup
 Requires:   %{name}-common = %{version}
 Requires:   %{name}-database-common = %{version}
@@ -1328,10 +1328,10 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %endif
 
 %files database-tools
-# dbtools with link to db libs (dbcheck, bscan, dbconvert)
+# dbtools with link to db libs (dbcheck, bscan, dbcopy)
 %defattr(-, root, root)
 %{_sbindir}/bareos-dbcheck
-%{_sbindir}/bareos-dbconvert
+%{_sbindir}/bareos-dbcopy
 %{_sbindir}/bscan
 %{_mandir}/man8/bareos-dbcheck.8.gz
 %{_mandir}/man8/bscan.8.gz

core/platforms/win32/winbareos.nsi

@@ -724,7 +724,7 @@ SectionIn 2 3
   SetOverwrite ifnewer
   File "bareos-dir.exe"
   File "bareos-dbcheck.exe"
-  File "bareos-dbconvert.exe"
+  File "bareos-dbcopy.exe"
   File "bsmtp.exe"
   File "bregex.exe"
   File "bwild.exe"
@@ -2145,7 +2145,7 @@ ConfDeleteSkip:
   Delete "$INSTDIR\bareos-sd.exe"
   Delete "$INSTDIR\bareos-dir.exe"
   Delete "$INSTDIR\bareos-dbcheck.exe"
-  Delete "$INSTDIR\bareos-dbconvert.exe"
+  Delete "$INSTDIR\bareos-dbcopy.exe"
   Delete "$INSTDIR\btape.exe"
   Delete "$INSTDIR\bls.exe"
   Delete "$INSTDIR\bextract.exe"

core/src/dird/CMakeLists.txt

@@ -161,7 +161,7 @@ else()
   target_link_libraries(bareos-dir ${BAREOS_DIR_LIBRARIES})
 endif()
 
-add_subdirectory(dbconvert)
+add_subdirectory(dbcopy)
 
 add_executable(bareos-dbcheck ${DBCHKSRCS})
 set(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats)

core/src/dird/dbconvert/CMakeLists.txt → core/src/dird/dbcopy/CMakeLists.txt

@@ -1,9 +1,9 @@
 if(dynamic-cats-backends)
-  add_executable(bareos-dbconvert dbconvert.cc database_table_descriptions.cc
+  add_executable(bareos-dbcopy dbcopy.cc database_table_descriptions.cc
                  database_column_descriptions.cc column_description.cc
                  database_import.cc database_import_mysql.cc database_export.cc
                  database_export_postgresql.cc)
-  target_link_libraries(bareos-dbconvert
+  target_link_libraries(bareos-dbcopy
       bareos
       dird_objects
       bareosfind
@@ -14,7 +14,7 @@ if(dynamic-cats-backends)
   )
 
 install(TARGETS
-  bareos-dbconvert
+  bareos-dbcopy
   DESTINATION "${sbindir}"
 )
 

core/src/dird/dbconvert/column_description.cc → core/src/dird/dbcopy/column_description.cc

@@ -19,8 +19,8 @@
    02110-1301, USA.
 */
 #include "include/bareos.h"
-#include "dird/dbconvert/column_description.h"
-#include "dird/dbconvert/row_data.h"
+#include "dird/dbcopy/column_description.h"
+#include "dird/dbcopy/row_data.h"
 
 #include <cstring>
 #include <vector>

core/src/dird/dbconvert/database_column_descriptions.cc → core/src/dird/dbcopy/database_column_descriptions.cc

@@ -22,7 +22,7 @@
 #include "include/bareos.h"
 #include "include/make_unique.h"
 #include "cats/cats.h"
-#include "dird/dbconvert/database_column_descriptions.h"
+#include "dird/dbcopy/database_column_descriptions.h"
 
 #include <algorithm>
 #include <iostream>

core/src/dird/dbconvert/database_column_descriptions.h → core/src/dird/dbcopy/database_column_descriptions.h

@@ -23,7 +23,7 @@
 #define BAREOS_SRC_DIRD_DBCONVERT_DATABASE_COLUMN_DESCRIPTIONS_H_
 
 #include "include/bareos.h"
-#include "dird/dbconvert/column_description.h"
+#include "dird/dbcopy/column_description.h"
 #include "cats/cats.h"
 
 #include <string>

core/src/dird/dbconvert/database_connection.h → core/src/dird/dbcopy/database_connection.h

@@ -28,7 +28,7 @@
 #include "dird/jcr_private.h"
 #include "dird/dird_conf.h"
 #include "dird/get_database_connection.h"
-#include "dird/dbconvert/database_type.h"
+#include "dird/dbcopy/database_type.h"
 #include "include/jcr.h"
 #include "lib/parse_conf.h"
 

core/src/dird/dbconvert/database_export.cc → core/src/dird/dbcopy/database_export.cc

@@ -20,9 +20,9 @@
 */
 
 #include "include/bareos.h"
-#include "dird/dbconvert/database_export.h"
-#include "dird/dbconvert/database_export_postgresql.h"
-#include "dird/dbconvert/database_table_descriptions.h"
+#include "dird/dbcopy/database_export.h"
+#include "dird/dbcopy/database_export_postgresql.h"
+#include "dird/dbcopy/database_table_descriptions.h"
 
 #include <memory>
 

core/src/dird/dbconvert/database_export.h → core/src/dird/dbcopy/database_export.h

@@ -22,7 +22,7 @@
 #ifndef BAREOS_SRC_DIRD_DBCONVERT_DATABASE_EXPORT_H_
 #define BAREOS_SRC_DIRD_DBCONVERT_DATABASE_EXPORT_H_
 
-#include "dird/dbconvert/row_data.h"
+#include "dird/dbcopy/row_data.h"
 
 #include <memory>
 

core/src/dird/dbconvert/database_export_postgresql.cc → core/src/dird/dbcopy/database_export_postgresql.cc

@@ -20,10 +20,10 @@
 */
 
 #include "include/bareos.h"
-#include "dird/dbconvert/database_export.h"
-#include "dird/dbconvert/database_export_postgresql.h"
-#include "dird/dbconvert/database_table_descriptions.h"
-#include "dird/dbconvert/row_data.h"
+#include "dird/dbcopy/database_export.h"
+#include "dird/dbcopy/database_export_postgresql.h"
+#include "dird/dbcopy/database_table_descriptions.h"
+#include "dird/dbcopy/row_data.h"
 #include "lib/bstringlist.h"
 
 #include <iostream>

core/src/dird/dbconvert/database_import.cc → core/src/dird/dbcopy/database_import.cc

@@ -20,10 +20,10 @@
 */
 
 #include "include/bareos.h"
-#include "dird/dbconvert/database_import.h"
-#include "dird/dbconvert/database_connection.h"
-#include "dird/dbconvert/database_table_descriptions.h"
-#include "dird/dbconvert/database_import_mysql.h"
+#include "dird/dbcopy/database_import.h"
+#include "dird/dbcopy/database_connection.h"
+#include "dird/dbcopy/database_table_descriptions.h"
+#include "dird/dbcopy/database_import_mysql.h"
 
 DatabaseImport::DatabaseImport(const DatabaseConnection& db_connection)
     : db_(db_connection.db)

core/src/dird/dbconvert/database_import_mysql.cc → core/src/dird/dbcopy/database_import_mysql.cc

@@ -20,10 +20,10 @@
 */
 
 #include "include/bareos.h"
-#include "dird/dbconvert/database_table_descriptions.h"
-#include "dird/dbconvert/row_data.h"
-#include "dird/dbconvert/database_export.h"
-#include "dird/dbconvert/database_import_mysql.h"
+#include "dird/dbcopy/database_table_descriptions.h"
+#include "dird/dbcopy/row_data.h"
+#include "dird/dbcopy/database_export.h"
+#include "dird/dbcopy/database_import_mysql.h"
 #include "include/make_unique.h"
 
 #include <cassert>

core/src/dird/dbconvert/database_import_mysql.h → core/src/dird/dbcopy/database_import_mysql.h

@@ -23,7 +23,7 @@
 #define BAREOS_SRC_DIRD_DBCONVERT_DATABASE_IMPORT_MYSQL_H_
 
 #include "include/bareos.h"
-#include "dird/dbconvert/database_import.h"
+#include "dird/dbcopy/database_import.h"
 
 class BareosDb;
 class DatabaseConnection;

core/src/dird/dbconvert/database_table_descriptions.cc → core/src/dird/dbcopy/database_table_descriptions.cc

@@ -21,7 +21,7 @@
 
 #include "include/bareos.h"
 #include "database_table_descriptions.h"
-#include "dird/dbconvert/database_column_descriptions.h"
+#include "dird/dbcopy/database_column_descriptions.h"
 #include "cats/cats.h"
 
 #include <algorithm>

core/src/dird/dbconvert/database_table_descriptions.h → core/src/dird/dbcopy/database_table_descriptions.h

@@ -22,8 +22,8 @@
 #ifndef BAREOS_SRC_DIRD_DBCONVERT_DATABASE_TABLES_H_
 #define BAREOS_SRC_DIRD_DBCONVERT_DATABASE_TABLES_H_
 
-#include "dird/dbconvert/database_column_descriptions.h"
-#include "dird/dbconvert/database_connection.h"
+#include "dird/dbcopy/database_column_descriptions.h"
+#include "dird/dbcopy/database_connection.h"
 #include "include/make_unique.h"
 
 #include <algorithm>

core/src/dird/dbconvert/dbconvert.cc → core/src/dird/dbcopy/dbcopy.cc

@@ -28,10 +28,10 @@
 #include "dird/dird_globals.h"
 #include "dird/jcr_private.h"
 #include "dird/job.h"
-#include "dird/dbconvert/database_connection.h"
-#include "dird/dbconvert/database_export.h"
-#include "dird/dbconvert/database_export_postgresql.h"
-#include "dird/dbconvert/database_import.h"
+#include "dird/dbcopy/database_connection.h"
+#include "dird/dbcopy/database_export.h"
+#include "dird/dbcopy/database_export_postgresql.h"
+#include "dird/dbcopy/database_import.h"
 #include "include/make_unique.h"
 #include "lib/parse_conf.h"
 #include "lib/util.h"
@@ -183,7 +183,7 @@ class DbConvert {
       kBareosVersionStrings.PrintCopyright(stderr, 2000);
 
       fprintf(stderr,
-              _("Usage: bareos-dbconvert [options] Source Destination\n"
+              _("Usage: bareos-dbcopy [options] Source Destination\n"
                 "        -c <path>   use <path> as configuration file or "
                 "directory\n"
                 "        -e          examine (compare) all rows"
@@ -222,8 +222,8 @@ int main(int argc, char** argv)
   Cleanup c;
 
   try {
-    DbConvert dbconvert(argc, argv);
-    dbconvert.DoDatabaseConversion();
+    DbConvert dbcopy(argc, argv);
+    dbcopy.DoDatabaseConversion();
   } catch (const std::runtime_error& e) {
     std::string errstring{e.what()};
     if (!errstring.empty()) {

core/src/dird/dbconvert/row_data.h → core/src/dird/dbcopy/row_data.h

@@ -22,7 +22,7 @@
 #define BAREOS_SRC_DIRD_DBCONVERT_ROW_DATA_H_
 
 #include "include/bareos.h"
-#include "dird/dbconvert/database_column_descriptions.h"
+#include "dird/dbcopy/database_column_descriptions.h"
 
 #include <vector>
 

systemtests/CMakeLists.txt

@@ -576,9 +576,9 @@ set(SYSTEM_TESTS_DISABLED # initially empty
 )
 
 if(mysql AND postgresql AND dynamic-cats-backends)
-  list(APPEND SYSTEM_TESTS "dbconvert-mysql-postgresql-test")
+  list(APPEND SYSTEM_TESTS "dbcopy-mysql-postgresql-test")
 else()
-  list(APPEND SYSTEM_TESTS_DISABLED "dbconvert-mysql-postgresql-test")
+  list(APPEND SYSTEM_TESTS_DISABLED "dbcopy-mysql-postgresql-test")
 endif()
 
 # python-bareos-test does not work on installed files

systemtests/tests/dbconvert-mysql-postgresql-test/testrunner → systemtests/tests/dbcopy-mysql-postgresql-test/testrunner

@@ -48,7 +48,7 @@ cp "${conf}"/bareos-dir.d/client/bareos-mysql-fd.conf.test "${conf}"/bareos-dir.
 run_bareos
 stop_bareos
 
-"${sbin}"/bareos-dbconvert -d -c ${current_test_directory}/etc/bareos mysql postgresql
+"${sbin}"/bareos-dbcopy -d -c ${current_test_directory}/etc/bareos mysql postgresql
 
 cat <<END_OF_DATA >$tmp/bconcmds
 @#