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

rename 'separator' to 'frac'; develop: PostgreSQLTest: missing ExecUtil class #1788

Browse Source
This commit is contained in:
Alex Fabijanic 2017-07-05 11:55:05 +02:00
parent 7f193697db
commit 128c5c57eb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Data/PostgreSQL/testsuite/src/PostgreSQLTest.cpp
View File

@ -952,8 +952,8 @@ void PostgreSQLTest::recreatePersonTimeTable()
void PostgreSQLTest::recreateIntsTable()
{
dropTable("Ints");
try { *_pSession << "CREATE TABLE " << ExecUtil::ints() << " (str INTEGER)", now; }
dropTable("Strings");
try { *_pSession << "CREATE TABLE Strings (str INTEGER)", now; }
catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail ("recreateIntsTable()"); }
catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail ("recreateIntsTable()"); }
}

12
Foundation/src/Var.cpp
View File

@ -415,7 +415,7 @@ Var Var::parse(const std::string& val, std::string::size_type& pos)
bool isNumber = false;
bool isSigned = false;
int separators = 0;
int separator = 0;
int frac = 0;
int index = 0;
size_t size = str.size();
for (size_t i = 0; i < size ; ++i)
@ -432,7 +432,7 @@ Var Var::parse(const std::string& val, std::string::size_type& pos)
}
else if (ch == '.' || ch == ',')
{
separator = ch;
frac = ch;
++separators;
if (separators > 1)
return str;
@ -443,17 +443,17 @@ Var Var::parse(const std::string& val, std::string::size_type& pos)
++index;
}
if (separator && isNumber)
if (frac && isNumber)
{
const double number = NumberParser::parseFloat(str, separator);
const double number = NumberParser::parseFloat(str, frac);
return Var(number);
}
else if (separator == 0 && isNumber && isSigned)
else if (frac == 0 && isNumber && isSigned)
{
const Poco::Int64 number = NumberParser::parse64(str);
return number;
}
else if (separator == 0 && isNumber && !isSigned)
else if (frac == 0 && isNumber && !isSigned)
{
const Poco::UInt64 number = NumberParser::parseUnsigned64(str);
return number;