Replace deprecated auto_ptr with unique_ptr in SQLCOnnection.

Change-Id: I0303d7c1c40e3392173899bf42751800eab2e7b6

diff --git a/src/manager/dpl/db/include/dpl/db/sql_connection.h b/src/manager/dpl/db/include/dpl/db/sql_connection.h
index e516421..ee90cc4 100644 (file)
--- a/src/manager/dpl/db/include/dpl/db/sql_connection.h
+++ b/src/manager/dpl/db/include/dpl/db/sql_connection.h
@@ -398,8 +398,8 @@ class SqlConnection
             GetColumnOptionalBlob(ColumnIndex column);
     };
 
-    // Move on copy semantics
-    typedef std::auto_ptr<DataCommand> DataCommandAutoPtr;
+    // Move on copy constructor. No copy semantics
+    typedef std::unique_ptr<DataCommand> DataCommandUniquePtr;
 
     // Open flags
     class Flag
@@ -543,7 +543,7 @@ class SqlConnection
      * @param format SQL statement
      * @return Data command representing stored procedure
      */
-    DataCommandAutoPtr PrepareDataCommand(const char *format, ...);
+    DataCommandUniquePtr PrepareDataCommand(const char *format, ...);
 
     /**
      * Check whether given table exists

diff --git a/src/manager/dpl/db/src/sql_connection.cpp b/src/manager/dpl/db/src/sql_connection.cpp
index 41a91fb..5e583c0 100644 (file)
--- a/src/manager/dpl/db/src/sql_connection.cpp
+++ b/src/manager/dpl/db/src/sql_connection.cpp
@@ -806,7 +806,7 @@ bool SqlConnection::CheckTableExist(const char *tableName)
         return false;
     }
 
-    DataCommandAutoPtr command =
+    DataCommandUniquePtr command =
         PrepareDataCommand("select tbl_name from sqlcipher_master where name=?;");
 
     command->BindString(1, tableName);
@@ -927,13 +927,13 @@ void SqlConnection::ExecCommand(const char *format, ...)
     }
 }
 
-SqlConnection::DataCommandAutoPtr SqlConnection::PrepareDataCommand(
+SqlConnection::DataCommandUniquePtr SqlConnection::PrepareDataCommand(
     const char *format,
     ...)
 {
     if (m_connection == NULL) {
         LogError("Cannot execute data command. Not connected to DB!");
-        return DataCommandAutoPtr();
+        return DataCommandUniquePtr();
     }
 
     char *rawBuffer;
@@ -951,12 +951,12 @@ SqlConnection::DataCommandAutoPtr SqlConnection::PrepareDataCommand(
 
     if (!buffer) {
         LogError("Failed to allocate statement string");
-        return DataCommandAutoPtr();
+        return DataCommandUniquePtr();
     }
 
     LogPedantic("Executing SQL data command: " << buffer.get());
 
-    return DataCommandAutoPtr(new DataCommand(this, buffer.get()));
+    return DataCommandUniquePtr(new DataCommand(this, buffer.get()));
 }
 
 SqlConnection::RowID SqlConnection::GetLastInsertRowID() const

diff --git a/src/manager/service/db-crypto.cpp b/src/manager/service/db-crypto.cpp
index 37d0fa5..daced42 100644 (file)
--- a/src/manager/service/db-crypto.cpp
+++ b/src/manager/service/db-crypto.cpp
@@ -196,7 +196,7 @@ using namespace DB;
     }
 
     bool DBCrypto::checkGlobalAliasExist(const std::string& alias) {
-        SqlConnection::DataCommandAutoPtr checkCmd =
+        SqlConnection::DataCommandUniquePtr checkCmd =
                 m_connection->PrepareDataCommand(select_check_global_alias_cmd);
         checkCmd->BindString(1, alias.c_str());
         if(checkCmd->Step()) {
@@ -210,7 +210,7 @@ using namespace DB;
     bool DBCrypto::checkAliasExist(
             const std::string& alias,
             const std::string& label) {
-        SqlConnection::DataCommandAutoPtr checkCmd =
+        SqlConnection::DataCommandUniquePtr checkCmd =
                 m_connection->PrepareDataCommand(select_check_alias_cmd);
         checkCmd->BindString(1, alias.c_str());
         checkCmd->BindString(2, label.c_str());
@@ -235,7 +235,7 @@ using namespace DB;
                         << ", label: " << row.smackLabel);
             }
 
-            SqlConnection::DataCommandAutoPtr insertCommand =
+            SqlConnection::DataCommandUniquePtr insertCommand =
                     m_connection->PrepareDataCommand(insert_main_cmd);
             insertCommand->BindString(1, row.alias.c_str());
             insertCommand->BindString(2, row.smackLabel.c_str());
@@ -261,7 +261,7 @@ using namespace DB;
                 "Couldn't save DBRow");
     }
 
-    DBRow DBCrypto::getRow(const SqlConnection::DataCommandAutoPtr &selectCommand) {
+    DBRow DBCrypto::getRow(const SqlConnection::DataCommandUniquePtr &selectCommand) {
         DBRow row;
         row.alias = selectCommand->GetColumnString(0);
         row.smackLabel = selectCommand->GetColumnString(1);
@@ -283,7 +283,7 @@ using namespace DB;
     {
         Try {
             Transaction transaction(this);
-            SqlConnection::DataCommandAutoPtr selectCommand =
+            SqlConnection::DataCommandUniquePtr selectCommand =
                     m_connection->PrepareDataCommand(select_alias_cmd);
             selectCommand->BindString(1, alias.c_str());
             selectCommand->BindInteger(2, static_cast<int>(type));
@@ -315,7 +315,7 @@ using namespace DB;
     {
         Try{
             Transaction transaction(this);
-            SqlConnection::DataCommandAutoPtr selectCommand =
+            SqlConnection::DataCommandUniquePtr selectCommand =
                     m_connection->PrepareDataCommand(select_key_alias_cmd);
             selectCommand->BindString(1, alias.c_str());
             selectCommand->BindInteger(2, static_cast<int>(DBDataType::DB_KEY_FIRST));
@@ -346,7 +346,7 @@ using namespace DB;
             AliasVector& aliases)
     {
         Try{
-            SqlConnection::DataCommandAutoPtr selectCommand =
+            SqlConnection::DataCommandUniquePtr selectCommand =
                             m_connection->PrepareDataCommand(select_type_cmd);
             selectCommand->BindInteger(1, static_cast<int>(type));
             selectCommand->BindInteger(2, static_cast<int>(type));
@@ -385,7 +385,7 @@ using namespace DB;
     {
         Try{
             Transaction transaction(this);
-            SqlConnection::DataCommandAutoPtr selectCommand =
+            SqlConnection::DataCommandUniquePtr selectCommand =
                             m_connection->PrepareDataCommand(select_key_type_cmd);
             selectCommand->BindInteger(1, static_cast<int>(DBDataType::DB_KEY_FIRST));
             selectCommand->BindInteger(2, static_cast<int>(DBDataType::DB_KEY_LAST));
@@ -415,7 +415,7 @@ using namespace DB;
     {
         Try {
             Transaction transaction(this);
-            SqlConnection::DataCommandAutoPtr deleteCommand =
+            SqlConnection::DataCommandUniquePtr deleteCommand =
                     m_connection->PrepareDataCommand(delete_alias_cmd);
             deleteCommand->BindString(1, alias.c_str());
             deleteCommand->BindString(2, label.c_str());
@@ -438,7 +438,7 @@ using namespace DB;
     {
         Try {
             Transaction transaction(this);
-            SqlConnection::DataCommandAutoPtr insertCommand =
+            SqlConnection::DataCommandUniquePtr insertCommand =
                     m_connection->PrepareDataCommand(insert_key_cmd);
             insertCommand->BindString(1, label.c_str());
             insertCommand->BindBlob(2, key);
@@ -459,7 +459,7 @@ using namespace DB;
     {
         Try {
             Transaction transaction(this);
-            SqlConnection::DataCommandAutoPtr selectCommand =
+            SqlConnection::DataCommandUniquePtr selectCommand =
                     m_connection->PrepareDataCommand(select_key_cmd);
             selectCommand->BindString(1, label.c_str());
 
@@ -486,7 +486,7 @@ using namespace DB;
     void DBCrypto::deleteKey(const std::string& label) {
         Try {
             Transaction transaction(this);
-            SqlConnection::DataCommandAutoPtr deleteCommand =
+            SqlConnection::DataCommandUniquePtr deleteCommand =
                     m_connection->PrepareDataCommand(delete_key_cmd);
             deleteCommand->BindString(1, label.c_str());
             deleteCommand->Step();

diff --git a/src/manager/service/db-crypto.h b/src/manager/service/db-crypto.h
index 7a292cc..9ff5c10 100644 (file)
--- a/src/manager/service/db-crypto.h
+++ b/src/manager/service/db-crypto.h
@@ -150,7 +150,7 @@ namespace CKM {
             bool m_inUserTransaction;
 
             void initDatabase();
-            DBRow getRow(const DB::SqlConnection::DataCommandAutoPtr &selectCommand);
+            DBRow getRow(const DB::SqlConnection::DataCommandUniquePtr &selectCommand);
             void createTable(
                     const char *create_cmd,
                     const char *table_name);