!288 use shared ptr

Merge pull request !288 from houpengtao/master
This commit is contained in:
openharmony_ci
2023-06-15 01:43:26 +00:00
committed by Gitee
5 changed files with 5 additions and 5 deletions
@@ -30,7 +30,7 @@ public:
virtual bool DeleteDbStore() = 0;
virtual bool Insert(const std::string &tableName, const std::vector<NativeRdb::ValuesBucket> &values) = 0;
virtual bool Delete(int32_t &deletedRows, const NativeRdb::RdbPredicates &predicates) = 0;
virtual std::unique_ptr<NativeRdb::ResultSet> Query(
virtual std::shared_ptr<NativeRdb::ResultSet> Query(
const NativeRdb::RdbPredicates &predicates, const std::vector<std::string> &columns) = 0;
virtual bool Update(
int &changedRows, const NativeRdb::ValuesBucket &values, const NativeRdb::RdbPredicates &predicates) = 0;
@@ -38,7 +38,7 @@ public:
virtual std::string GetTableName() = 0;
virtual std::string GetTableCreateSql() = 0;
void ParseDbValues(std::unique_ptr<ResultSet> resultSet, std::vector<T> &values)
void ParseDbValues(std::shared_ptr<ResultSet> resultSet, std::vector<T> &values)
{
ENGINE_CHECK(resultSet != nullptr, return, "ParseDbValues resultSet is null");
resultSet->GoToFirstRow();
@@ -35,7 +35,7 @@ public:
bool DeleteDbStore() final;
bool Insert(const std::string &tableName, const std::vector<NativeRdb::ValuesBucket> &values) final;
bool Delete(int32_t &deletedRows, const NativeRdb::RdbPredicates &predicates) final;
std::unique_ptr<NativeRdb::ResultSet> Query(
std::shared_ptr<NativeRdb::ResultSet> Query(
const NativeRdb::RdbPredicates &predicates, const std::vector<std::string> &columns) final;
bool Update(
int &changedRows, const NativeRdb::ValuesBucket &values, const NativeRdb::RdbPredicates &predicates) final;
@@ -129,7 +129,7 @@ bool TableBaseOperator<Table, T>::Query(std::vector<T> &results, const NativeRdb
{
std::vector<std::string> columns;
ENGINE_CHECK(dataBase_ != nullptr, return false, "TableBaseOperator Query db is null");
std::unique_ptr<ResultSet> resultSet = dataBase_->Query(predicates, columns);
auto resultSet = dataBase_->Query(predicates, columns);
ENGINE_CHECK(resultSet != nullptr, return false, "TableBaseOperator Query failed to get result");
ENGINE_CHECK(table_ != nullptr, return false, "TableBaseOperator Query table is null");
@@ -85,7 +85,7 @@ bool SqliteDb::Delete(int32_t &deletedRows, const NativeRdb::RdbPredicates &pred
return true;
}
std::unique_ptr<NativeRdb::ResultSet> SqliteDb::Query(
std::shared_ptr<NativeRdb::ResultSet> SqliteDb::Query(
const NativeRdb::RdbPredicates &predicates, const std::vector<std::string> &columns)
{
std::shared_ptr<NativeRdb::RdbStore> dbStore = GetDbStore();