dbcopy: renamed a function and add log output

bareos · Jan 31, 2020 · f1a1193 · f1a1193
1 parent e3291e0
commit f1a1193
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;