From 7c8d0e8d9155735512d437101727265ea4d77207 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Wed, 25 Sep 2019 18:33:40 +0200
Subject: [PATCH] Renamed TAPE.ENCRYPTION_KEY to TAPE.ENCRYPTION_KEY_NAME in
and only in the CTA database schema
---
catalogue/MysqlCatalogue.cpp | 4 ++--
catalogue/OracleCatalogue.cpp | 4 ++--
catalogue/PostgresCatalogue.cpp | 4 ++--
catalogue/RdbmsCatalogue.cpp | 16 ++++++++--------
catalogue/SqliteCatalogue.cpp | 4 ++--
catalogue/common_catalogue_schema.sql | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/catalogue/MysqlCatalogue.cpp b/catalogue/MysqlCatalogue.cpp
index 5f4f01837b..a4fde1099b 100644
--- a/catalogue/MysqlCatalogue.cpp
+++ b/catalogue/MysqlCatalogue.cpp
@@ -147,7 +147,7 @@ common::dataStructures::Tape MysqlCatalogue::selectTapeForUpdate(rdbms::Conn &co
"VID AS VID,"
"LOGICAL_LIBRARY_NAME AS LOGICAL_LIBRARY_NAME,"
"TAPE_POOL_NAME AS TAPE_POOL_NAME,"
- "ENCRYPTION_KEY AS ENCRYPTION_KEY,"
+ "ENCRYPTION_KEY_NAME AS ENCRYPTION_KEY_NAME,"
"CAPACITY_IN_BYTES AS CAPACITY_IN_BYTES,"
"DATA_IN_BYTES AS DATA_IN_BYTES,"
"LAST_FSEQ AS LAST_FSEQ,"
@@ -191,7 +191,7 @@ common::dataStructures::Tape MysqlCatalogue::selectTapeForUpdate(rdbms::Conn &co
tape.vid = rset.columnString("VID");
tape.logicalLibraryName = rset.columnString("LOGICAL_LIBRARY_NAME");
tape.tapePoolName = rset.columnString("TAPE_POOL_NAME");
- tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY");
+ tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY_NAME");
tape.capacityInBytes = rset.columnUint64("CAPACITY_IN_BYTES");
tape.dataOnTapeInBytes = rset.columnUint64("DATA_IN_BYTES");
tape.lastFSeq = rset.columnUint64("LAST_FSEQ");
diff --git a/catalogue/OracleCatalogue.cpp b/catalogue/OracleCatalogue.cpp
index 98b28965e2..4272a95bc2 100644
--- a/catalogue/OracleCatalogue.cpp
+++ b/catalogue/OracleCatalogue.cpp
@@ -212,7 +212,7 @@ common::dataStructures::Tape OracleCatalogue::selectTapeForUpdate(rdbms::Conn &c
"VID AS VID,"
"LOGICAL_LIBRARY_NAME AS LOGICAL_LIBRARY_NAME,"
"TAPE_POOL_NAME AS TAPE_POOL_NAME,"
- "ENCRYPTION_KEY AS ENCRYPTION_KEY,"
+ "ENCRYPTION_KEY_NAME AS ENCRYPTION_KEY_NAME,"
"CAPACITY_IN_BYTES AS CAPACITY_IN_BYTES,"
"DATA_IN_BYTES AS DATA_IN_BYTES,"
"LAST_FSEQ AS LAST_FSEQ,"
@@ -256,7 +256,7 @@ common::dataStructures::Tape OracleCatalogue::selectTapeForUpdate(rdbms::Conn &c
tape.vid = rset.columnString("VID");
tape.logicalLibraryName = rset.columnString("LOGICAL_LIBRARY_NAME");
tape.tapePoolName = rset.columnString("TAPE_POOL_NAME");
- tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY");
+ tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY_NAME");
tape.capacityInBytes = rset.columnUint64("CAPACITY_IN_BYTES");
tape.dataOnTapeInBytes = rset.columnUint64("DATA_IN_BYTES");
tape.lastFSeq = rset.columnUint64("LAST_FSEQ");
diff --git a/catalogue/PostgresCatalogue.cpp b/catalogue/PostgresCatalogue.cpp
index 579245dc2a..c2668b87b4 100644
--- a/catalogue/PostgresCatalogue.cpp
+++ b/catalogue/PostgresCatalogue.cpp
@@ -202,7 +202,7 @@ common::dataStructures::Tape PostgresCatalogue::selectTapeForUpdate(rdbms::Conn
"VID AS VID,"
"LOGICAL_LIBRARY_NAME AS LOGICAL_LIBRARY_NAME,"
"TAPE_POOL_NAME AS TAPE_POOL_NAME,"
- "ENCRYPTION_KEY AS ENCRYPTION_KEY,"
+ "ENCRYPTION_KEY_NAME AS ENCRYPTION_KEY_NAME,"
"CAPACITY_IN_BYTES AS CAPACITY_IN_BYTES,"
"DATA_IN_BYTES AS DATA_IN_BYTES,"
"LAST_FSEQ AS LAST_FSEQ,"
@@ -246,7 +246,7 @@ common::dataStructures::Tape PostgresCatalogue::selectTapeForUpdate(rdbms::Conn
tape.vid = rset.columnString("VID");
tape.logicalLibraryName = rset.columnString("LOGICAL_LIBRARY_NAME");
tape.tapePoolName = rset.columnString("TAPE_POOL_NAME");
- tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY");
+ tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY_NAME");
tape.capacityInBytes = rset.columnUint64("CAPACITY_IN_BYTES");
tape.dataOnTapeInBytes = rset.columnUint64("DATA_IN_BYTES");
tape.lastFSeq = rset.columnUint64("LAST_FSEQ");
diff --git a/catalogue/RdbmsCatalogue.cpp b/catalogue/RdbmsCatalogue.cpp
index 4b2d2ec501..22364e83a5 100644
--- a/catalogue/RdbmsCatalogue.cpp
+++ b/catalogue/RdbmsCatalogue.cpp
@@ -2114,7 +2114,7 @@ std::list<common::dataStructures::Tape> RdbmsCatalogue::getTapes(rdbms::Conn &co
"TAPE.LOGICAL_LIBRARY_NAME AS LOGICAL_LIBRARY_NAME,"
"TAPE.TAPE_POOL_NAME AS TAPE_POOL_NAME,"
"TAPE_POOL.VO AS VO,"
- "TAPE.ENCRYPTION_KEY AS ENCRYPTION_KEY,"
+ "TAPE.ENCRYPTION_KEY_NAME AS ENCRYPTION_KEY_NAME,"
"TAPE.CAPACITY_IN_BYTES AS CAPACITY_IN_BYTES,"
"TAPE.DATA_IN_BYTES AS DATA_IN_BYTES,"
"TAPE.LAST_FSEQ AS LAST_FSEQ,"
@@ -2239,7 +2239,7 @@ std::list<common::dataStructures::Tape> RdbmsCatalogue::getTapes(rdbms::Conn &co
tape.logicalLibraryName = rset.columnString("LOGICAL_LIBRARY_NAME");
tape.tapePoolName = rset.columnString("TAPE_POOL_NAME");
tape.vo = rset.columnString("VO");
- tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY");
+ tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY_NAME");
tape.capacityInBytes = rset.columnUint64("CAPACITY_IN_BYTES");
tape.dataOnTapeInBytes = rset.columnUint64("DATA_IN_BYTES");
tape.lastFSeq = rset.columnUint64("LAST_FSEQ");
@@ -2289,7 +2289,7 @@ common::dataStructures::VidToTapeMap RdbmsCatalogue::getTapesByVid(const std::se
"TAPE.LOGICAL_LIBRARY_NAME AS LOGICAL_LIBRARY_NAME,"
"TAPE.TAPE_POOL_NAME AS TAPE_POOL_NAME,"
"TAPE_POOL.VO AS VO,"
- "TAPE.ENCRYPTION_KEY AS ENCRYPTION_KEY,"
+ "TAPE.ENCRYPTION_KEY_NAME AS ENCRYPTION_KEY_NAME,"
"TAPE.CAPACITY_IN_BYTES AS CAPACITY_IN_BYTES,"
"TAPE.DATA_IN_BYTES AS DATA_IN_BYTES,"
"TAPE.LAST_FSEQ AS LAST_FSEQ,"
@@ -2361,7 +2361,7 @@ common::dataStructures::VidToTapeMap RdbmsCatalogue::getTapesByVid(const std::se
tape.logicalLibraryName = rset.columnString("LOGICAL_LIBRARY_NAME");
tape.tapePoolName = rset.columnString("TAPE_POOL_NAME");
tape.vo = rset.columnString("VO");
- tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY");
+ tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY_NAME");
tape.capacityInBytes = rset.columnUint64("CAPACITY_IN_BYTES");
tape.dataOnTapeInBytes = rset.columnUint64("DATA_IN_BYTES");
tape.lastFSeq = rset.columnUint64("LAST_FSEQ");
@@ -2415,7 +2415,7 @@ common::dataStructures::VidToTapeMap RdbmsCatalogue::getAllTapes() const {
"TAPE.LOGICAL_LIBRARY_NAME AS LOGICAL_LIBRARY_NAME,"
"TAPE.TAPE_POOL_NAME AS TAPE_POOL_NAME,"
"TAPE_POOL.VO AS VO,"
- "TAPE.ENCRYPTION_KEY AS ENCRYPTION_KEY,"
+ "TAPE.ENCRYPTION_KEY_NAME AS ENCRYPTION_KEY_NAME,"
"TAPE.CAPACITY_IN_BYTES AS CAPACITY_IN_BYTES,"
"TAPE.DATA_IN_BYTES AS DATA_IN_BYTES,"
"TAPE.LAST_FSEQ AS LAST_FSEQ,"
@@ -2463,7 +2463,7 @@ common::dataStructures::VidToTapeMap RdbmsCatalogue::getAllTapes() const {
tape.logicalLibraryName = rset.columnString("LOGICAL_LIBRARY_NAME");
tape.tapePoolName = rset.columnString("TAPE_POOL_NAME");
tape.vo = rset.columnString("VO");
- tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY");
+ tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY_NAME");
tape.capacityInBytes = rset.columnUint64("CAPACITY_IN_BYTES");
tape.dataOnTapeInBytes = rset.columnUint64("DATA_IN_BYTES");
tape.lastFSeq = rset.columnUint64("LAST_FSEQ");
@@ -2935,7 +2935,7 @@ void RdbmsCatalogue::modifyTapeEncryptionKey(const common::dataStructures::Secur
const time_t now = time(nullptr);
const char *const sql =
"UPDATE TAPE SET "
- "ENCRYPTION_KEY = :ENCRYPTION_KEY,"
+ "ENCRYPTION_KEY_NAME = :ENCRYPTION_KEY_NAME,"
"LAST_UPDATE_USER_NAME = :LAST_UPDATE_USER_NAME,"
"LAST_UPDATE_HOST_NAME = :LAST_UPDATE_HOST_NAME,"
"LAST_UPDATE_TIME = :LAST_UPDATE_TIME "
@@ -2943,7 +2943,7 @@ void RdbmsCatalogue::modifyTapeEncryptionKey(const common::dataStructures::Secur
"VID = :VID";
auto conn = m_connPool.getConn();
auto stmt = conn.createStmt(sql);
- stmt.bindOptionalString(":ENCRYPTION_KEY", optionalEncryptionKey);
+ stmt.bindOptionalString(":ENCRYPTION_KEY_NAME", optionalEncryptionKey);
stmt.bindString(":LAST_UPDATE_USER_NAME", admin.username);
stmt.bindString(":LAST_UPDATE_HOST_NAME", admin.host);
stmt.bindUint64(":LAST_UPDATE_TIME", now);
diff --git a/catalogue/SqliteCatalogue.cpp b/catalogue/SqliteCatalogue.cpp
index 541329ba7d..70a02f862d 100644
--- a/catalogue/SqliteCatalogue.cpp
+++ b/catalogue/SqliteCatalogue.cpp
@@ -250,7 +250,7 @@ common::dataStructures::Tape SqliteCatalogue::selectTape(rdbms::Conn &conn, cons
"VID AS VID,"
"LOGICAL_LIBRARY_NAME AS LOGICAL_LIBRARY_NAME,"
"TAPE_POOL_NAME AS TAPE_POOL_NAME,"
- "ENCRYPTION_KEY AS ENCRYPTION_KEY,"
+ "ENCRYPTION_KEY_NAME AS ENCRYPTION_KEY_NAME,"
"CAPACITY_IN_BYTES AS CAPACITY_IN_BYTES,"
"DATA_IN_BYTES AS DATA_IN_BYTES,"
"LAST_FSEQ AS LAST_FSEQ,"
@@ -294,7 +294,7 @@ common::dataStructures::Tape SqliteCatalogue::selectTape(rdbms::Conn &conn, cons
tape.vid = rset.columnString("VID");
tape.logicalLibraryName = rset.columnString("LOGICAL_LIBRARY_NAME");
tape.tapePoolName = rset.columnString("TAPE_POOL_NAME");
- tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY");
+ tape.encryptionKey = rset.columnOptionalString("ENCRYPTION_KEY_NAME");
tape.capacityInBytes = rset.columnUint64("CAPACITY_IN_BYTES");
tape.dataOnTapeInBytes = rset.columnUint64("DATA_IN_BYTES");
tape.lastFSeq = rset.columnUint64("LAST_FSEQ");
diff --git a/catalogue/common_catalogue_schema.sql b/catalogue/common_catalogue_schema.sql
index ff97245efa..f854c1f19e 100644
--- a/catalogue/common_catalogue_schema.sql
+++ b/catalogue/common_catalogue_schema.sql
@@ -80,7 +80,7 @@ CREATE TABLE TAPE(
VENDOR VARCHAR(100) CONSTRAINT TAPE_V2_NN NOT NULL,
LOGICAL_LIBRARY_NAME VARCHAR(100) CONSTRAINT TAPE_LLN_NN NOT NULL,
TAPE_POOL_NAME VARCHAR(100) CONSTRAINT TAPE_TPN_NN NOT NULL,
- ENCRYPTION_KEY VARCHAR(100),
+ ENCRYPTION_KEY_NAME VARCHAR(100),
CAPACITY_IN_BYTES UINT64TYPE CONSTRAINT TAPE_CIB_NN NOT NULL,
DATA_IN_BYTES UINT64TYPE CONSTRAINT TAPE_DIB_NN NOT NULL,
LAST_FSEQ UINT64TYPE CONSTRAINT TAPE_LF_NN NOT NULL,
--
GitLab