eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

ArrayParser doesn't require the string to be null terminated anymore,

Browse source 
instead the length of the string can be passed in.

This is first step in process to allow Value to work without null terminator.
This commit is contained in:
eelke 2018-12-24 08:10:09 +01:00
parent 93c8b49f61
commit b210c570fc
4 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tests/PgsqlTests/tst_ArrayParser.cpp
View file

@ -9,7 +9,7 @@ using namespace Pgsql;
TEST(ArrayParser, emptyInput)
{
const char * input = "";
ArrayParser parser(input);
ArrayParser parser(input, -1);
auto res = parser.GetNextElem();
ASSERT_FALSE(res.ok);
}
@ -17,7 +17,7 @@ TEST(ArrayParser, emptyInput)
TEST(ArrayParser, emptyArray)
{
const char * input = "{}";
ArrayParser parser(input);
ArrayParser parser(input, -1);
auto res = parser.GetNextElem();
ASSERT_FALSE(res.ok);
}
@ -25,7 +25,7 @@ TEST(ArrayParser, emptyArray)
TEST(ArrayParser, oneInt)
{
const char * input = "{1}";
ArrayParser parser(input);
ArrayParser parser(input, -1);
auto res = parser.GetNextElem();
ASSERT_TRUE(res.ok);
ASSERT_EQ(res.value, "1");
@ -37,7 +37,7 @@ TEST(ArrayParser, oneInt)
TEST(ArrayParser, twoElems)
{
const char * input = "{1,2.3}";
ArrayParser parser(input);
ArrayParser parser(input, -1);
auto res = parser.GetNextElem();
ASSERT_TRUE(res.ok);
@ -54,7 +54,7 @@ TEST(ArrayParser, twoElems)
TEST(ArrayParser, nullElem)
{
const char * input = "{NULL}";
ArrayParser parser(input);
ArrayParser parser(input, -1);
auto res = parser.GetNextElem();
ASSERT_TRUE(res.ok);
ASSERT_EQ(res.value, std::nullopt);
@ -71,7 +71,7 @@ TEST(ArrayParser, nullElem)
TEST(ArrayParser, quotedValues)
{
const char * input = R"_({"ab c","de\"f"})_";
ArrayParser parser(input);
ArrayParser parser(input, -1);
auto res = parser.GetNextElem();
ASSERT_TRUE(res.ok);
ASSERT_EQ(res.value, "ab c");
@ -84,6 +84,19 @@ TEST(ArrayParser, quotedValues)
ASSERT_FALSE(res.ok);
}
TEST(ArrayParser, unexpectedEndWithNullTerminator)
{
const char * input = "{abc";
ArrayParser parser(input, -1);
ASSERT_THROW(parser.GetNextElem(), std::runtime_error);
}
TEST(ArrayParser, unexpectedEndWithoutNullTerminator)
{
const char * input = "{abc";
ArrayParser parser(input, 3); // 3 will put c past the end
ASSERT_THROW(parser.GetNextElem(), std::runtime_error);
}
// ARRAY['2017-12-11'::date, NULL]
// {2017-12-11,NULL}