generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-25 08:06:03 +01:00
Code Issues Projects Releases Wiki Activity

chore(SQLite): fix enum names case for #3018

Browse Source
This commit is contained in:
Alex Fabijanic 2022-05-29 22:18:38 -05:00
parent 5c29df0860
commit e25a8b3ec7
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Data/SQLite/include/Poco/Data/SQLite/SQLite.h
View File

@ -68,10 +68,11 @@ namespace SQLite {
extern const std::string TRANSACTION_TYPE_PROPERTY_KEY; extern const std::string TRANSACTION_TYPE_PROPERTY_KEY;
enum class TransactionType { enum class TransactionType
deferred, {
exclusive, DEFERRED,
immediate EXCLUSIVE,
IMMEDIATE
}; };
} } } // namespace Poco::Data::SQLite } } } // namespace Poco::Data::SQLite

8
Data/SQLite/src/SessionImpl.cpp
View File

@ -52,7 +52,7 @@ SessionImpl::SessionImpl(const std::string& fileName, std::size_t loginTimeout):
_pDB(0), _pDB(0),
_connected(false), _connected(false),
_isTransaction(false), _isTransaction(false),
_transactionType(TransactionType::deferred) _transactionType(TransactionType::DEFERRED)
{ {
open(); open();
setConnectionTimeout(loginTimeout); setConnectionTimeout(loginTimeout);
@ -91,13 +91,13 @@ void SessionImpl::begin()
SQLiteStatementImpl tmp(*this, _pDB); SQLiteStatementImpl tmp(*this, _pDB);
switch (_transactionType) switch (_transactionType)
{ {
case TransactionType::deferred: case TransactionType::DEFERRED:
tmp.add(DEFERRED_BEGIN_TRANSACTION); tmp.add(DEFERRED_BEGIN_TRANSACTION);
break; break;
case TransactionType::exclusive: case TransactionType::EXCLUSIVE:
tmp.add(EXCLUSIVE_BEGIN_TRANSACTION); tmp.add(EXCLUSIVE_BEGIN_TRANSACTION);
break; break;
case TransactionType::immediate: case TransactionType::IMMEDIATE:
tmp.add(IMMEDIATE_BEGIN_TRANSACTION); tmp.add(IMMEDIATE_BEGIN_TRANSACTION);
break; break;
} }

10
Data/SQLite/testsuite/src/SQLiteTest.cpp
View File

@ -464,7 +464,7 @@ void SQLiteTest::testInsertCharPointer()
pc = (const char*) std::calloc(9, sizeof(char)); pc = (const char*) std::calloc(9, sizeof(char));
poco_check_ptr (pc); poco_check_ptr (pc);
std::strncpy((char*) pc, "lastname", 8); std::strncpy((char*) pc, "lastname", 9);
Statement stmt = (tmp << "INSERT INTO PERSON VALUES(:ln, :fn, :ad, :age)", Statement stmt = (tmp << "INSERT INTO PERSON VALUES(:ln, :fn, :ad, :age)",
bind(pc), bind(pc),
bind("firstname"), bind("firstname"),
@ -3205,7 +3205,7 @@ void SQLiteTest::testTransaction()
std::string result; std::string result;
session.setTransactionIsolation(Session::TRANSACTION_READ_COMMITTED); session.setTransactionIsolation(Session::TRANSACTION_READ_COMMITTED);
session.setProperty(Poco::Data::SQLite::TRANSACTION_TYPE_PROPERTY_KEY, Poco::Data::SQLite::TransactionType::exclusive); session.setProperty(Poco::Data::SQLite::TRANSACTION_TYPE_PROPERTY_KEY, Poco::Data::SQLite::TransactionType::EXCLUSIVE);
{ {
Transaction trans(session); Transaction trans(session);
assertTrue (trans.isActive()); assertTrue (trans.isActive());
@ -3227,7 +3227,7 @@ void SQLiteTest::testTransaction()
session << "SELECT count(*) FROM Person", into(count), now; session << "SELECT count(*) FROM Person", into(count), now;
assertTrue (0 == count); assertTrue (0 == count);
assertTrue (!session.isTransaction()); assertTrue (!session.isTransaction());
session.setProperty(Poco::Data::SQLite::TRANSACTION_TYPE_PROPERTY_KEY, Poco::Data::SQLite::TransactionType::immediate); session.setProperty(Poco::Data::SQLite::TRANSACTION_TYPE_PROPERTY_KEY, Poco::Data::SQLite::TransactionType::IMMEDIATE);
{ {
Transaction trans(session); Transaction trans(session);
session << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; session << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now;
@ -3442,10 +3442,10 @@ void SQLiteTest::testTransactionTypeProperty()
using namespace Poco::Data::SQLite; using namespace Poco::Data::SQLite;
Session tmp(Connector::KEY, "dummy.db"); Session tmp(Connector::KEY, "dummy.db");
tmp.setProperty(TRANSACTION_TYPE_PROPERTY_KEY, TransactionType::exclusive); tmp.setProperty(TRANSACTION_TYPE_PROPERTY_KEY, TransactionType::EXCLUSIVE);
Poco::Any property = tmp.getProperty(TRANSACTION_TYPE_PROPERTY_KEY); Poco::Any property = tmp.getProperty(TRANSACTION_TYPE_PROPERTY_KEY);
TransactionType value = Poco::RefAnyCast<TransactionType>(property); TransactionType value = Poco::RefAnyCast<TransactionType>(property);
assertTrue(value == TransactionType::exclusive); assertTrue(value == TransactionType::EXCLUSIVE);
} catch (Poco::Exception&) {} } catch (Poco::Exception&) {}
} }