generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-29 04:17:55 +01:00
Code Issues Projects Releases Wiki Activity

feat(Data::Statement): make statementsCount() Optional 230

Browse Source
This commit is contained in:
Alex Fabijanic
2023-11-02 00:28:18 +01:00
parent afd9c8c408
commit 4f0315aeb0
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/include/Poco/Data/Statement.h
View File

@@ -305,7 +305,7 @@ public:
const std::string& toString() const; const std::string& toString() const;
/// Creates a string from the accumulated SQL statement. /// Creates a string from the accumulated SQL statement.
std::size_t statementsCount() const; Optional<std::size_t> statementsCount() const;
/// Returns the total number of SQL statements held in the accummulated SQL statement. /// Returns the total number of SQL statements held in the accummulated SQL statement.
Optional<bool> parse(); Optional<bool> parse();

9
Data/src/Statement.cpp
View File

@@ -155,13 +155,14 @@ Statement& Statement::reset()
return *this; return *this;
} }
std::size_t Statement::statementsCount() const Optional<std::size_t> Statement::statementsCount() const
{ {
Optional<std::size_t> ret;
#ifndef POCO_DATA_NO_SQL_PARSER #ifndef POCO_DATA_NO_SQL_PARSER
return _pParseResult->size(); if (_pImpl->session().shouldParse())
#else ret = _pParseResult->size();
return 0u;
#endif #endif
return ret;
} }

2
Data/testsuite/src/DataTest.cpp
View File

@@ -1451,6 +1451,7 @@ void DataTest::testSQLParse()
"'",'a',"'",-1, 1u, 1.5, "42", now); "'",'a',"'",-1, 1u, 1.5, "42", now);
assertTrue ("SELECT 'a',-1,1,1.500000,42 FROM Person WHERE Name LIKE 'Simp%'" == stmt.toString()); assertTrue ("SELECT 'a',-1,1,1.500000,42 FROM Person WHERE Name LIKE 'Simp%'" == stmt.toString());
assertEqual (1u, stmt.statementsCount().value());
assertTrue (stmt.isSelect().value()); assertTrue (stmt.isSelect().value());
assertTrue (stmt.hasSelect().value()); assertTrue (stmt.hasSelect().value());
assertTrue (!stmt.isUpdate().value()); assertTrue (!stmt.isUpdate().value());
@@ -1470,6 +1471,7 @@ void DataTest::testSQLParse()
"PREPARE prep_inst FROM 'INSERT INTO test VALUES (?, ?, ?)';" "PREPARE prep_inst FROM 'INSERT INTO test VALUES (?, ?, ?)';"
"EXECUTE prep_inst(1, 2, 3);"); "EXECUTE prep_inst(1, 2, 3);");
stmt.execute(); stmt.execute();
assertEqual (8u, stmt.statementsCount().value());
assertTrue (!stmt.isSelect().value()); assertTrue (!stmt.isSelect().value());
assertTrue (stmt.hasSelect().value()); assertTrue (stmt.hasSelect().value());
assertTrue (!stmt.isUpdate().value()); assertTrue (!stmt.isUpdate().value());