From 94d1e0da02ad0b4f7cf5bac7b3f8ad8a420209f8 Mon Sep 17 00:00:00 2001
From: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
Date: Thu, 20 Jun 2019 09:46:46 +0200
Subject: [PATCH] Turns out the tables list is hard-coded 4 times. Not going to
refactor this now...
---
catalogue/DropSchemaCmd.cpp | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/catalogue/DropSchemaCmd.cpp b/catalogue/DropSchemaCmd.cpp
index 7ca2a8e100..e74b36b575 100644
--- a/catalogue/DropSchemaCmd.cpp
+++ b/catalogue/DropSchemaCmd.cpp
@@ -148,7 +148,8 @@ void DropSchemaCmd::dropSqliteCatalogueSchema(rdbms::Conn &conn) {
"LOGICAL_LIBRARY",
"MOUNT_POLICY",
"ACTIVITIES_WEIGHTS",
- "USAGESTATS"};
+ "USAGESTATS"
+ };
dropDatabaseTables(conn, tablesToDrop);
} catch(exception::Exception &ex) {
throw exception::Exception(std::string(__FUNCTION__) + " failed: " + ex.getMessage().str());
@@ -176,7 +177,9 @@ void DropSchemaCmd::dropMysqlCatalogueSchema(rdbms::Conn &conn) {
"TAPE_POOL",
"LOGICAL_LIBRARY",
"MOUNT_POLICY",
- "ACTIVITIES_WEIGHTS"};
+ "ACTIVITIES_WEIGHTS",
+ "USAGESTATS"
+ };
dropDatabaseTables(conn, tablesToDrop);
std::list<std::string> triggersToDrop = {
@@ -241,7 +244,8 @@ void DropSchemaCmd::dropOracleCatalogueSchema(rdbms::Conn &conn) {
"TAPE_POOL",
"LOGICAL_LIBRARY",
"MOUNT_POLICY",
- "ACTIVITIES_WEIGHTS"
+ "ACTIVITIES_WEIGHTS",
+ "USAGESTATS"
};
dropDatabaseTables(conn, tablesToDrop);
@@ -273,7 +277,8 @@ void DropSchemaCmd::dropPostgresCatalogueSchema(rdbms::Conn &conn) {
"TAPE_POOL",
"LOGICAL_LIBRARY",
"MOUNT_POLICY",
- "ACTIVITIES_WEIGHTS"
+ "ACTIVITIES_WEIGHTS",
+ "USAGESTATS"
};
dropDatabaseTables(conn, tablesToDrop);
--
GitLab