From 53d75c3dae790fb6137a7cd6364404359c38f82a Mon Sep 17 00:00:00 2001
From: Steven Murray <steven.murray@cern.ch>
Date: Mon, 23 May 2016 18:00:56 +0200
Subject: [PATCH] Renamed DbStmt::bind() to DbStmt::bindString()

---
 catalogue/DbStmt.hpp          |   2 +-
 catalogue/OcciRsetTest.cpp    |   2 +-
 catalogue/OcciStmt.cpp        |   2 +-
 catalogue/OcciStmt.hpp        |   2 +-
 catalogue/SqliteCatalogue.cpp | 146 +++++++++++++++++-----------------
 catalogue/SqliteStmt.cpp      |   2 +-
 catalogue/SqliteStmt.hpp      |   2 +-
 catalogue/SqliteStmtTest.cpp  |   4 +-
 8 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/catalogue/DbStmt.hpp b/catalogue/DbStmt.hpp
index a492968092..1ab5b09af0 100644
--- a/catalogue/DbStmt.hpp
+++ b/catalogue/DbStmt.hpp
@@ -63,7 +63,7 @@ public:
    * @param paramName The name of the parameter.
    * @param paramValue The value to be bound.
    */ 
-  virtual void bind(const std::string &paramName, const std::string &paramValue) = 0;
+  virtual void bindString(const std::string &paramName, const std::string &paramValue) = 0;
 
   /**
    *  Executes the statement and returns the result set.
diff --git a/catalogue/OcciRsetTest.cpp b/catalogue/OcciRsetTest.cpp
index a773b12215..ef2766bce2 100644
--- a/catalogue/OcciRsetTest.cpp
+++ b/catalogue/OcciRsetTest.cpp
@@ -109,7 +109,7 @@ TEST_F(cta_catalogue_OcciRsetTest, bind_c_string) {
     dbLogin.database.c_str()));
   const char *const sql = "SELECT DUMMY FROM DUAL WHERE DUMMY = :DUMMY";
   std::unique_ptr<DbStmt> stmt(conn->createStmt(sql));
-  stmt->bind(":DUMMY", "X");
+  stmt->bindString(":DUMMY", "X");
   std::unique_ptr<DbRset> rset(stmt->executeQuery());
   ASSERT_TRUE(rset->next());
   std::string text(rset->columnText("DUMMY"));
diff --git a/catalogue/OcciStmt.cpp b/catalogue/OcciStmt.cpp
index 03299f3f36..1684362f31 100644
--- a/catalogue/OcciStmt.cpp
+++ b/catalogue/OcciStmt.cpp
@@ -92,7 +92,7 @@ void OcciStmt::bindUint64(const std::string &paramName, const uint64_t paramValu
 //------------------------------------------------------------------------------
 // bind
 //------------------------------------------------------------------------------
-void OcciStmt::bind(const std::string &paramName, const std::string &paramValue) {
+void OcciStmt::bindString(const std::string &paramName, const std::string &paramValue) {
   try {
     const unsigned paramIdx = m_paramNameToIdx.getIdx(paramName);
     m_stmt->setString(paramIdx, paramValue);
diff --git a/catalogue/OcciStmt.hpp b/catalogue/OcciStmt.hpp
index 41a65c06e6..d355b67494 100644
--- a/catalogue/OcciStmt.hpp
+++ b/catalogue/OcciStmt.hpp
@@ -92,7 +92,7 @@ public:
    * @param paramName The name of the parameter.
    * @param paramValue The value to be bound.
    */
-  virtual void bind(const std::string &paramName, const std::string &paramValue);
+  virtual void bindString(const std::string &paramName, const std::string &paramValue);
 
   /**
    *  Executes the statement and returns the result set.
diff --git a/catalogue/SqliteCatalogue.cpp b/catalogue/SqliteCatalogue.cpp
index 418103f3e1..ce29e14c78 100644
--- a/catalogue/SqliteCatalogue.cpp
+++ b/catalogue/SqliteCatalogue.cpp
@@ -107,13 +107,13 @@ void SqliteCatalogue::createAdminUser(
         ":CREATION_LOG_TIME);";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
-    stmt->bind(":ADMIN_USER_NAME", user.name);
+    stmt->bindString(":ADMIN_USER_NAME", user.name);
 
-    stmt->bind(":USER_COMMENT", comment);
+    stmt->bindString(":USER_COMMENT", comment);
 
-    stmt->bind(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
-    stmt->bind(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
-    stmt->bind(":CREATION_LOG_HOST_NAME", cliIdentity.host);
+    stmt->bindString(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
+    stmt->bindString(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
+    stmt->bindString(":CREATION_LOG_HOST_NAME", cliIdentity.host);
     stmt->bindUint64(":CREATION_LOG_TIME", now);
 
     stmt->executeNonQuery();
@@ -239,13 +239,13 @@ void SqliteCatalogue::createAdminHost(
         ":CREATION_LOG_TIME);";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
-    stmt->bind(":ADMIN_HOST_NAME", hostName);
+    stmt->bindString(":ADMIN_HOST_NAME", hostName);
 
-    stmt->bind(":USER_COMMENT", comment);
+    stmt->bindString(":USER_COMMENT", comment);
 
-    stmt->bind(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
-    stmt->bind(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
-    stmt->bind(":CREATION_LOG_HOST_NAME", cliIdentity.host);
+    stmt->bindString(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
+    stmt->bindString(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
+    stmt->bindString(":CREATION_LOG_HOST_NAME", cliIdentity.host);
     stmt->bindUint64(":CREATION_LOG_TIME", now);
 
     stmt->executeNonQuery();
@@ -372,14 +372,14 @@ void SqliteCatalogue::createStorageClass(
         ":CREATION_LOG_TIME);";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
-    stmt->bind(":STORAGE_CLASS_NAME", name);
+    stmt->bindString(":STORAGE_CLASS_NAME", name);
     stmt->bindUint64(":NB_COPIES", nbCopies);
 
-    stmt->bind(":USER_COMMENT", comment);
+    stmt->bindString(":USER_COMMENT", comment);
 
-    stmt->bind(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
-    stmt->bind(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
-    stmt->bind(":CREATION_LOG_HOST_NAME", cliIdentity.host);
+    stmt->bindString(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
+    stmt->bindString(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
+    stmt->bindString(":CREATION_LOG_HOST_NAME", cliIdentity.host);
     stmt->bindUint64(":CREATION_LOG_TIME", now);
 
     stmt->executeNonQuery();
@@ -519,15 +519,15 @@ void SqliteCatalogue::createTapePool(
         ":CREATION_LOG_TIME);";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
-    stmt->bind(":TAPE_POOL_NAME", name);
+    stmt->bindString(":TAPE_POOL_NAME", name);
     stmt->bindUint64(":NB_PARTIAL_TAPES", nbPartialTapes);
     stmt->bindUint64(":IS_ENCRYPTED", encryptionValue);
 
-    stmt->bind(":USER_COMMENT", comment);
+    stmt->bindString(":USER_COMMENT", comment);
 
-    stmt->bind(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
-    stmt->bind(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
-    stmt->bind(":CREATION_LOG_HOST_NAME", cliIdentity.host);
+    stmt->bindString(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
+    stmt->bindString(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
+    stmt->bindString(":CREATION_LOG_HOST_NAME", cliIdentity.host);
     stmt->bindUint64(":CREATION_LOG_TIME", now);
 
     stmt->executeNonQuery();
@@ -677,15 +677,15 @@ void SqliteCatalogue::createArchiveRoute(
         ":CREATION_LOG_TIME);";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
-    stmt->bind(":STORAGE_CLASS_NAME", storageClassName);
+    stmt->bindString(":STORAGE_CLASS_NAME", storageClassName);
     stmt->bindUint64(":COPY_NB", copyNb);
-    stmt->bind(":TAPE_POOL_NAME", tapePoolName);
+    stmt->bindString(":TAPE_POOL_NAME", tapePoolName);
 
-    stmt->bind(":USER_COMMENT", comment);
+    stmt->bindString(":USER_COMMENT", comment);
 
-    stmt->bind(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
-    stmt->bind(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
-    stmt->bind(":CREATION_LOG_HOST_NAME", cliIdentity.host);
+    stmt->bindString(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
+    stmt->bindString(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
+    stmt->bindString(":CREATION_LOG_HOST_NAME", cliIdentity.host);
     stmt->bindUint64(":CREATION_LOG_TIME", now);
 
     stmt->executeNonQuery();
@@ -822,13 +822,13 @@ void SqliteCatalogue::createLogicalLibrary(
         ":CREATION_LOG_TIME);";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
-    stmt->bind(":LOGICAL_LIBRARY_NAME", name);
+    stmt->bindString(":LOGICAL_LIBRARY_NAME", name);
 
-    stmt->bind(":USER_COMMENT", comment);
+    stmt->bindString(":USER_COMMENT", comment);
 
-    stmt->bind(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
-    stmt->bind(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
-    stmt->bind(":CREATION_LOG_HOST_NAME", cliIdentity.host);
+    stmt->bindString(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
+    stmt->bindString(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
+    stmt->bindString(":CREATION_LOG_HOST_NAME", cliIdentity.host);
     stmt->bindUint64(":CREATION_LOG_TIME", now);
 
     stmt->executeNonQuery();
@@ -996,10 +996,10 @@ void SqliteCatalogue::createTape(
         ":CREATION_LOG_TIME);";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
-    stmt->bind(":VID", vid);
-    stmt->bind(":LOGICAL_LIBRARY_NAME", logicalLibraryName);
-    stmt->bind(":TAPE_POOL_NAME", tapePoolName);
-    stmt->bind(":ENCRYPTION_KEY", encryptionKey);
+    stmt->bindString(":VID", vid);
+    stmt->bindString(":LOGICAL_LIBRARY_NAME", logicalLibraryName);
+    stmt->bindString(":TAPE_POOL_NAME", tapePoolName);
+    stmt->bindString(":ENCRYPTION_KEY", encryptionKey);
     stmt->bindUint64(":CAPACITY_IN_BYTES", capacityInBytes);
     stmt->bindUint64(":DATA_IN_BYTES", 0);
     stmt->bindUint64(":LAST_FSEQ", 0);
@@ -1007,20 +1007,20 @@ void SqliteCatalogue::createTape(
     stmt->bindUint64(":IS_FULL", fullValue);
     stmt->bindUint64(":LBP_IS_ON", 0);
 
-    stmt->bind(":LABEL_DRIVE", "");
+    stmt->bindString(":LABEL_DRIVE", "");
     stmt->bindUint64(":LABEL_TIME", 0);
 
-    stmt->bind(":LAST_READ_DRIVE", "");
+    stmt->bindString(":LAST_READ_DRIVE", "");
     stmt->bindUint64(":LAST_READ_TIME", 0);
 
-    stmt->bind(":LAST_WRITE_DRIVE", "");
+    stmt->bindString(":LAST_WRITE_DRIVE", "");
     stmt->bindUint64(":LAST_WRITE_TIME", 0);
 
-    stmt->bind(":USER_COMMENT", comment);
+    stmt->bindString(":USER_COMMENT", comment);
 
-    stmt->bind(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
-    stmt->bind(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
-    stmt->bind(":CREATION_LOG_HOST_NAME", cliIdentity.host);
+    stmt->bindString(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
+    stmt->bindString(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
+    stmt->bindString(":CREATION_LOG_HOST_NAME", cliIdentity.host);
     stmt->bindUint64(":CREATION_LOG_TIME", now);
 
     stmt->executeNonQuery();
@@ -1278,14 +1278,14 @@ void SqliteCatalogue::createRequester(
         ":CREATION_LOG_TIME);";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
-    stmt->bind(":REQUESTER_NAME", user.name);
-    stmt->bind(":MOUNT_POLICY_NAME", mountPolicy);
+    stmt->bindString(":REQUESTER_NAME", user.name);
+    stmt->bindString(":MOUNT_POLICY_NAME", mountPolicy);
 
-    stmt->bind(":USER_COMMENT", comment);
+    stmt->bindString(":USER_COMMENT", comment);
 
-    stmt->bind(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
-    stmt->bind(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
-    stmt->bind(":CREATION_LOG_HOST_NAME", cliIdentity.host);
+    stmt->bindString(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
+    stmt->bindString(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
+    stmt->bindString(":CREATION_LOG_HOST_NAME", cliIdentity.host);
     stmt->bindUint64(":CREATION_LOG_TIME", now);
 
     stmt->executeNonQuery();
@@ -1442,7 +1442,7 @@ void SqliteCatalogue::createMountPolicy(
         ":CREATION_LOG_TIME);";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
-    stmt->bind(":MOUNT_POLICY_NAME", name);
+    stmt->bindString(":MOUNT_POLICY_NAME", name);
 
     stmt->bindUint64(":ARCHIVE_PRIORITY", archivePriority);
     stmt->bindUint64(":ARCHIVE_MIN_REQUEST_AGE", minArchiveRequestAge);
@@ -1452,11 +1452,11 @@ void SqliteCatalogue::createMountPolicy(
 
     stmt->bindUint64(":MAX_DRIVES_ALLOWED", maxDrivesAllowed);
 
-    stmt->bind(":USER_COMMENT", comment);
+    stmt->bindString(":USER_COMMENT", comment);
 
-    stmt->bind(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
-    stmt->bind(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
-    stmt->bind(":CREATION_LOG_HOST_NAME", cliIdentity.host);
+    stmt->bindString(":CREATION_LOG_USER_NAME", cliIdentity.user.name);
+    stmt->bindString(":CREATION_LOG_GROUP_NAME", cliIdentity.user.group);
+    stmt->bindString(":CREATION_LOG_HOST_NAME", cliIdentity.host);
     stmt->bindUint64(":CREATION_LOG_TIME", now);
 
     stmt->executeNonQuery();
@@ -1727,16 +1727,16 @@ void SqliteCatalogue::insertArchiveFile(const ArchiveFileRow &row) {
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
     stmt->bindUint64(":ARCHIVE_FILE_ID", row.archiveFileId);
-    stmt->bind(":DISK_INSTANCE", row.diskInstance);
-    stmt->bind(":DISK_FILE_ID", row.diskFileId);
-    stmt->bind(":DISK_FILE_PATH", row.diskFilePath);
-    stmt->bind(":DISK_FILE_USER", row.diskFileUser);
-    stmt->bind(":DISK_FILE_GROUP", row.diskFileGroup);
-    stmt->bind(":DISK_FILE_RECOVERY_BLOB", row.diskFileRecoveryBlob);
+    stmt->bindString(":DISK_INSTANCE", row.diskInstance);
+    stmt->bindString(":DISK_FILE_ID", row.diskFileId);
+    stmt->bindString(":DISK_FILE_PATH", row.diskFilePath);
+    stmt->bindString(":DISK_FILE_USER", row.diskFileUser);
+    stmt->bindString(":DISK_FILE_GROUP", row.diskFileGroup);
+    stmt->bindString(":DISK_FILE_RECOVERY_BLOB", row.diskFileRecoveryBlob);
     stmt->bindUint64(":FILE_SIZE", row.size);
-    stmt->bind(":CHECKSUM_TYPE", "HELP");
-    stmt->bind(":CHECKSUM_VALUE", "HELP");
-    stmt->bind(":STORAGE_CLASS_NAME", row.storageClassName);
+    stmt->bindString(":CHECKSUM_TYPE", "HELP");
+    stmt->bindString(":CHECKSUM_VALUE", "HELP");
+    stmt->bindString(":STORAGE_CLASS_NAME", row.storageClassName);
     stmt->bindUint64(":CREATION_TIME", now);
     stmt->bindUint64(":RECONCILIATION_TIME", now);
 
@@ -1758,8 +1758,8 @@ uint64_t SqliteCatalogue::getArchiveFileId(const std::string &diskInstance, cons
         "DISK_INSTANCE = :DISK_INSTANCE AND "
         "DISK_FILE_ID = :DISK_FILE_ID;";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
-    stmt->bind(":DISK_INSTANCE", diskInstance);
-    stmt->bind(":DISK_FILE_ID", diskFileId);
+    stmt->bindString(":DISK_INSTANCE", diskInstance);
+    stmt->bindString(":DISK_FILE_ID", diskFileId);
     std::unique_ptr<DbRset> rset(stmt->executeQuery());
 
     if (rset->next()) {
@@ -2044,7 +2044,7 @@ common::dataStructures::TapeCopyToPoolMap SqliteCatalogue::
         "FROM ARCHIVE_ROUTE WHERE "
         "STORAGE_CLASS_NAME = :STORAGE_CLASS_NAME;";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
-    stmt->bind(":STORAGE_CLASS_NAME", storageClass);
+    stmt->bindString(":STORAGE_CLASS_NAME", storageClass);
     std::unique_ptr<DbRset> rset(stmt->executeQuery());
     while (rset->next()) {
       const uint64_t copyNb = rset->columnUint64("COPY_NB");
@@ -2070,7 +2070,7 @@ uint64_t SqliteCatalogue::getExpectedNbArchiveRoutes(const std::string &storageC
         "FROM ARCHIVE_ROUTE WHERE "
         "STORAGE_CLASS_NAME = :STORAGE_CLASS_NAME;";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
-    stmt->bind(":STORAGE_CLASS_NAME", storageClass);
+    stmt->bindString(":STORAGE_CLASS_NAME", storageClass);
     std::unique_ptr<DbRset> rset(stmt->executeQuery());
     while (rset->next()) {
       nbRoutes = rset->columnUint64("NB_ROUTES");
@@ -2113,7 +2113,7 @@ common::dataStructures::MountPolicy SqliteCatalogue::
     "WHERE "
       "REQUESTER.REQUESTER_NAME = :REQUESTER_NAME;";
   std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
-  stmt->bind(":REQUESTER_NAME", user.name);
+  stmt->bindString(":REQUESTER_NAME", user.name);
   std::unique_ptr<DbRset> rset(stmt->executeQuery());
   if(rset->next()) {
     common::dataStructures::MountPolicy policy;
@@ -2178,7 +2178,7 @@ bool SqliteCatalogue::userIsAdmin(const std::string &userName) const {
     "FROM ADMIN_USER WHERE "
       "ADMIN_USER_NAME = :ADMIN_USER_NAME;";
   std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
-  stmt->bind(":ADMIN_USER_NAME", userName);
+  stmt->bindString(":ADMIN_USER_NAME", userName);
   std::unique_ptr<DbRset> rset(stmt->executeQuery());
   return rset->next();
 }
@@ -2193,7 +2193,7 @@ bool SqliteCatalogue::hostIsAdmin(const std::string &hostName) const {
     "FROM ADMIN_HOST WHERE "
       "ADMIN_HOST_NAME = :ADMIN_HOST_NAME;";
   std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
-  stmt->bind(":ADMIN_HOST_NAME", hostName);
+  stmt->bindString(":ADMIN_HOST_NAME", hostName);
   std::unique_ptr<DbRset> rset(stmt->executeQuery());
   return rset->next();
 }
@@ -2216,7 +2216,7 @@ std::list<TapeForWriting> SqliteCatalogue::getTapesForWriting(const std::string
         "IS_FULL = 0 AND "
         "LOGICAL_LIBRARY_NAME = :LOGICAL_LIBRARY_NAME;";
     std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
-    stmt->bind(":LOGICAL_LIBRARY_NAME", logicalLibraryName);
+    stmt->bindString(":LOGICAL_LIBRARY_NAME", logicalLibraryName);
     std::unique_ptr<DbRset> rset(stmt->executeQuery());
     while (rset->next()) {
       TapeForWriting tape;
@@ -2260,7 +2260,7 @@ void SqliteCatalogue::createTapeFile(const common::dataStructures::TapeFile &tap
       ":ARCHIVE_FILE_ID);";
   std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
 
-  stmt->bind(":VID", tapeFile.vid);
+  stmt->bindString(":VID", tapeFile.vid);
   stmt->bindUint64(":FSEQ", tapeFile.fSeq);
   stmt->bindUint64(":BLOCK_ID", tapeFile.blockId);
   stmt->bindUint64(":COMPRESSED_SIZE", tapeFile.compressedSize);
@@ -2322,7 +2322,7 @@ void SqliteCatalogue::setTapeLastFSeq(const std::string &vid, const uint64_t las
     "WHERE "
       "VID=:VID;";
   std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
-  stmt->bind(":VID", vid);
+  stmt->bindString(":VID", vid);
   stmt->bindUint64(":LAST_FSEQ", lastFSeq);
   stmt->executeNonQuery();
 }
@@ -2337,7 +2337,7 @@ uint64_t SqliteCatalogue::getTapeLastFSeq(const std::string &vid) const {
     "FROM TAPE WHERE "
       "VID = :VID;";
   std::unique_ptr<DbStmt> stmt(m_conn.createStmt(sql));
-  stmt->bind(":VID", vid);
+  stmt->bindString(":VID", vid);
   std::unique_ptr<DbRset> rset(stmt->executeQuery());
   if(rset->next()) {
     return rset->columnUint64("LAST_FSEQ");
diff --git a/catalogue/SqliteStmt.cpp b/catalogue/SqliteStmt.cpp
index 7fea7948fe..f9bdc9a316 100644
--- a/catalogue/SqliteStmt.cpp
+++ b/catalogue/SqliteStmt.cpp
@@ -96,7 +96,7 @@ void SqliteStmt::bindUint64(const std::string &paramName, const uint64_t paramVa
 //------------------------------------------------------------------------------
 // bind
 //------------------------------------------------------------------------------
-void SqliteStmt::bind(const std::string &paramName, const std::string &paramValue) {
+void SqliteStmt::bindString(const std::string &paramName, const std::string &paramValue) {
   const int paramIdx = getParamIndex(paramName);
   const int bindRc = sqlite3_bind_text(m_stmt, paramIdx, paramValue.c_str(), -1, SQLITE_TRANSIENT);
   if(SQLITE_OK != bindRc) {
diff --git a/catalogue/SqliteStmt.hpp b/catalogue/SqliteStmt.hpp
index 0a75e93aa3..cdbf26666b 100644
--- a/catalogue/SqliteStmt.hpp
+++ b/catalogue/SqliteStmt.hpp
@@ -87,7 +87,7 @@ public:
    * @param paramName The name of the parameter.
    * @param paramValue The value to be bound.
    */ 
-  virtual void bind(const std::string &paramName, const std::string &paramValue);
+  virtual void bindString(const std::string &paramName, const std::string &paramValue);
 
   /**
    * Executes the statement and returns the result set.
diff --git a/catalogue/SqliteStmtTest.cpp b/catalogue/SqliteStmtTest.cpp
index 3ad2722a2e..7ff8e87e8c 100644
--- a/catalogue/SqliteStmtTest.cpp
+++ b/catalogue/SqliteStmtTest.cpp
@@ -169,8 +169,8 @@ TEST_F(cta_catalogue_SqliteStmtTest, insert_with_bind) {
         ":COL2,"
         ":COL3);";
     std::unique_ptr<DbStmt> stmt(conn.createStmt(sql));
-    ASSERT_NO_THROW(stmt->bind(":COL1", "one"));
-    ASSERT_NO_THROW(stmt->bind(":COL2", "two"));
+    ASSERT_NO_THROW(stmt->bindString(":COL1", "one"));
+    ASSERT_NO_THROW(stmt->bindString(":COL2", "two"));
     ASSERT_NO_THROW(stmt->bindUint64(":COL3", 3));
     stmt->executeNonQuery();
   }
-- 
GitLab