Skip to content

Commit 58e8a87

Browse files
committed
Fixed bugs
1 parent f539014 commit 58e8a87

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

ydb/public/lib/ydb_cli/common/csv_parser_ut.cpp

+10-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Y_UNIT_TEST_SUITE(YdbCliCsvParserTests) {
2222
paramTypes.insert({name, value.GetType()});
2323
}
2424
std::map<TString, TString> paramSources;
25-
TCsvParser parser(std::move(header), ',', paramTypes, paramSources);
25+
TCsvParser parser(std::move(header), ',', "", &paramTypes, &paramSources);
2626
TParamsBuilder paramBuilder;
2727
parser.GetParams(std::move(data), paramBuilder);
2828
auto values = paramBuilder.Build().GetValues();
@@ -40,9 +40,9 @@ Y_UNIT_TEST_SUITE(YdbCliCsvParserTests) {
4040
paramTypes.insert({member.name(), member.type()});
4141
}
4242

43-
TCsvParser parser(std::move(header), ',', paramTypes, {});
43+
TCsvParser parser(std::move(header), ',', "", &paramTypes, nullptr);
4444
TValueBuilder valueBuilder;
45-
parser.GetValue(std::move(data), result.GetType(), valueBuilder);
45+
parser.GetValue(std::move(data), valueBuilder, result.GetType());
4646
UNIT_ASSERT(CompareValues(valueBuilder.Build(), result));
4747
}
4848

@@ -105,6 +105,7 @@ Y_UNIT_TEST_SUITE(YdbCliCsvParserTests) {
105105
CommonTestParams("name", "\"{\"\"a\"\":10, \"\"b\"\":\"\"string\"\"}\"", {{"$name", TValueBuilder().Json("{\"a\":10, \"b\":\"string\"}").Build()}});
106106
CommonTestParams("name", "строка", {{"$name", TValueBuilder().OptionalUtf8("строка").Build()}});
107107
CommonTestParams("name", "\"\"", {{"$name", TValueBuilder().OptionalUtf8({}).Build()}});
108+
CommonTestParams("name", "данные", {{"$name", TValueBuilder().Pg(TPgValue(TPgValue::VK_TEXT, "данные", TPgType("some_type"))).Build()}});
108109
}
109110

110111
Y_UNIT_TEST(OtherPrimitiveTypesTestValue) {
@@ -120,6 +121,7 @@ Y_UNIT_TEST_SUITE(YdbCliCsvParserTests) {
120121
CommonTestValue("name", "\"{\"\"a\"\":10, \"\"b\"\":\"\"string\"\"}\"", MakeStruct("name", TValueBuilder().Json("{\"a\":10, \"b\":\"string\"}").Build()));
121122
CommonTestValue("name", "строка", MakeStruct("name", TValueBuilder().OptionalUtf8("строка").Build()));
122123
CommonTestValue("name", "\"\"", MakeStruct("name", TValueBuilder().OptionalUtf8({}).Build()));
124+
CommonTestValue("name", "данные", MakeStruct("name", TValueBuilder().Pg(TPgValue(TPgValue::VK_TEXT, "данные", TPgType("some_type"))).Build()));
123125
}
124126

125127
Y_UNIT_TEST(EdgeValuesTestParams) {
@@ -137,6 +139,11 @@ Y_UNIT_TEST_SUITE(YdbCliCsvParserTests) {
137139
CommonTestParams("name", "-32768", {{"$name", TValueBuilder().Int16(-32768).Build()}});
138140
CommonTestParams("name", "-2147483648", {{"$name", TValueBuilder().Int32(-2147483648).Build()}});
139141
CommonTestParams("name", "-9223372036854775808", {{"$name", TValueBuilder().Int64(std::numeric_limits<i64>::min()).Build()}});
142+
143+
double minDouble = std::numeric_limits<double>::lowest();
144+
double maxDouble = std::numeric_limits<double>::max();
145+
CommonTestParams("name", std::to_string(minDouble), {{"$name", TValueBuilder().Double(minDouble).Build()}});
146+
CommonTestParams("name", std::to_string(maxDouble), {{"$name", TValueBuilder().Double(maxDouble).Build()}});
140147
}
141148

142149
Y_UNIT_TEST(MultipleFields) {

ydb/public/lib/ydb_cli/common/parameters.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ bool TCommandWithParameters::GetNextParams(THolder<TParamsBuilder>& paramBuilder
227227
}
228228
--SkipRows;
229229
}
230-
CsvParser = TCsvParser(std::move(headerRow), Delimiter, " ", &ParamTypes, &ParameterSources);
230+
CsvParser = TCsvParser(std::move(headerRow), Delimiter, "", &ParamTypes, &ParameterSources);
231231
} else {
232232
Input = MakeHolder<TSimpleParamStream>();
233233
}

0 commit comments

Comments
 (0)