From 3ec99c5f73322865a3abf081e9132709325c1abe Mon Sep 17 00:00:00 2001
From: Frank Ueberschar <frank.ueberschar@bareos.com>
Date: Wed, 29 Jan 2020 13:53:00 +0100
Subject: [PATCH] dbcopy: renamed a function and add log output

---
 core/src/dird/dbcopy/database_column_descriptions.cc | 10 +++++++---
 core/src/dird/dbcopy/database_column_descriptions.h  |  4 ++--
 core/src/dird/dbcopy/database_export_postgresql.cc   |  2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/src/dird/dbcopy/database_column_descriptions.cc b/core/src/dird/dbcopy/database_column_descriptions.cc
index b4b0baf5efc..fcb99b0b5bc 100644
--- a/core/src/dird/dbcopy/database_column_descriptions.cc
+++ b/core/src/dird/dbcopy/database_column_descriptions.cc
@@ -31,7 +31,7 @@ DatabaseColumnDescriptions::DatabaseColumnDescriptions(BareosDb* db) : db_{db}
 {
 }
 
-void DatabaseColumnDescriptions::SelectTableDescriptions(
+void DatabaseColumnDescriptions::SelectColumnDescriptions(
     const std::string& sql_query,
     DB_RESULT_HANDLER* ResultHandler)
 {
@@ -72,7 +72,11 @@ DatabaseColumnDescriptionsPostgresql::DatabaseColumnDescriptionsPostgresql(
       "table_name = '"};
   query += table_name;
   query += "'";
-  SelectTableDescriptions(query, ResultHandler);
+
+  std::cout << "Collecting column descriptions for: " << table_name
+            << std::endl;
+
+  SelectColumnDescriptions(query, ResultHandler);
 }
 
 int DatabaseColumnDescriptionsMysql::ResultHandler(void* ctx,
@@ -103,5 +107,5 @@ DatabaseColumnDescriptionsMysql::DatabaseColumnDescriptionsMysql(
   query += " table_schema='";
   query += db->get_db_name();
   query += "'";
-  SelectTableDescriptions(query, ResultHandler);
+  SelectColumnDescriptions(query, ResultHandler);
 }
diff --git a/core/src/dird/dbcopy/database_column_descriptions.h b/core/src/dird/dbcopy/database_column_descriptions.h
index 52dd9df1820..e7638bf5fc2 100644
--- a/core/src/dird/dbcopy/database_column_descriptions.h
+++ b/core/src/dird/dbcopy/database_column_descriptions.h
@@ -47,8 +47,8 @@ class DatabaseColumnDescriptions {
     kDataType = 1,
     kCharMaxLenght = 2
   };
-  void SelectTableDescriptions(const std::string& sql_query,
-                               DB_RESULT_HANDLER* ResultHandler);
+  void SelectColumnDescriptions(const std::string& sql_query,
+                                DB_RESULT_HANDLER* ResultHandler);
 
  private:
   BareosDb* db_;
diff --git a/core/src/dird/dbcopy/database_export_postgresql.cc b/core/src/dird/dbcopy/database_export_postgresql.cc
index 280cc5cb5e5..66dea35775b 100644
--- a/core/src/dird/dbcopy/database_export_postgresql.cc
+++ b/core/src/dird/dbcopy/database_export_postgresql.cc
@@ -37,6 +37,8 @@ DatabaseExportPostgresql::DatabaseExportPostgresql(
   if (clear_tables) {
     for (const auto& t : table_descriptions_->tables) {
       if (t.table_name != "version") {
+        std::cout << "Deleting contents of table: " << t.table_name
+                  << std::endl;
         std::string query("DELETE ");
         query += " FROM ";
         query += t.table_name;