thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow null values in postgresql protocol

Browse Source
This commit is contained in:
kssenii 2021-06-01 13:45:32 +00:00
parent 5dda97bef1
commit ccf5455624
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/test/fasttest/run.sh
View File

@ -378,6 +378,9 @@ function run_tests
01852_jit_if 01852_jit_if
01865_jit_comparison_constant_result 01865_jit_comparison_constant_result
01871_merge_tree_compile_expressions 01871_merge_tree_compile_expressions
# needs psql
01889_postgresql_protocol_null_fields
) )
time clickhouse-test --hung-check -j 8 --order=random --use-skip-list \ time clickhouse-test --hung-check -j 8 --order=random --use-skip-list \

3
src/Core/PostgreSQLProtocol.h
View File

@ -724,8 +724,9 @@ public:
Int32 size() const override Int32 size() const override
{ {
Int32 sz = 4 + 2; // size of message + number of fields Int32 sz = 4 + 2; // size of message + number of fields
/// If values is NULL, field size is -1 and data not added.
for (const std::shared_ptr<ISerializable> & field : row) for (const std::shared_ptr<ISerializable> & field : row)
sz += 4 + field->size(); sz += 4 + (field->size() > 0 ? field->size() : 0);
return sz; return sz;
} }

5
tests/queries/0_stateless/01889_postgresql_protocol_null_fields.reference Normal file
View File

@ -0,0 +1,5 @@
NULL
------
(1 row)

7
tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/env bash
CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh
. "$CUR_DIR"/../shell_config.sh
psql --host localhost --port ${CLICKHOUSE_PORT_POSTGRESQL} default -c "SELECT NULL;"