boost/mysql
2
0
Fork 0
mirror of https://github.com/boostorg/mysql.git synced 2026-02-17 01:42:17 +00:00
Code Issues Projects Releases Wiki Activity

Added parsing of prepared statement responses

Browse Source 
Fixed problems in execute request serialization
This commit is contained in:
ruben
2019-08-13 22:10:10 +01:00
parent 69ba45ff30
commit 87288f232a
8 changed files with 249 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/message_serialization.cpp
View File

@@ -89,7 +89,7 @@ void mysql::serialize(DynamicBuffer& buffer, const HandshakeResponse& value)
serialize(buffer, value.client_plugin_name);
}
// Command phase, general
// Resultsets
mysql::ReadIterator mysql::deserialize(ReadIterator from, ReadIterator last, ColumnDefinition& output)
{
int_lenenc length_fixed_length_fields;
@@ -108,6 +108,13 @@ mysql::ReadIterator mysql::deserialize(ReadIterator from, ReadIterator last, Col
return from;
}
void mysql::serialize_binary_value(DynamicBuffer& buffer, const BinaryValue& value)
{
std::visit([&buffer](auto v) {
mysql::serialize(buffer, v);
}, value);
}
// Prepared statements
void mysql::serialize(DynamicBuffer& buffer, const StmtPrepare& value)
{
@@ -128,13 +135,6 @@ mysql::ReadIterator mysql::deserialize(ReadIterator from, ReadIterator last, Stm
return from;
}
void mysql::serialize(DynamicBuffer& buffer, const BinaryValue& value)
{
std::visit([&buffer](auto v) {
mysql::serialize(buffer, v);
}, value);
}
void mysql::serialize(DynamicBuffer& buffer, const StmtExecute& value)
{
serialize(buffer, Command::COM_STMT_EXECUTE);
@@ -149,7 +149,7 @@ void mysql::serialize(DynamicBuffer& buffer, const StmtExecute& value)
std::vector<std::uint8_t> null_bitmap (traits.byte_count(), 0);
for (std::size_t i = 0; i < value.param_values.size(); ++i)
{
if (value.param_values[i].field_type == FieldType::NULL_)
if (std::holds_alternative<std::nullptr_t>(value.param_values[i]))
{
null_bitmap[traits.byte_pos(i)] |= (1 << traits.bit_pos(i));
}
@@ -162,18 +162,51 @@ void mysql::serialize(DynamicBuffer& buffer, const StmtExecute& value)
{
for (const auto& param: value.param_values)
{
serialize(buffer, param.field_type);
serialize(buffer, int1(param.is_signed ? 0 : 0x80));
auto type = compute_field_type(param);
serialize(buffer, type.first);
serialize(buffer, int1(type.second ? 0 : 0x80));
}
for (const auto& param: value.param_values)
{
serialize(buffer, param.value);
serialize_binary_value(buffer, param);
}
}
}
}
mysql::ReadIterator mysql::deserialize(ReadIterator from, ReadIterator last, StmtExecuteResponseHeader& output)
{
// TODO: int1 status: must be 0 to be deserialized as part of this?
return deserialize(from, last, output.num_fields);
}
// TODO: refactor this
#define MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(type, typenum, issigned) \
template <> \
constexpr std::pair<mysql::FieldType, bool> \
compute_field_type_impl<type>() { return { mysql::FieldType::typenum, issigned }; };
template <typename T> constexpr std::pair<mysql::FieldType, bool> compute_field_type_impl();
MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(std::int8_t, TINY, true);
MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(std::uint8_t, TINY, false);
MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(std::int16_t, SHORT, true);
MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(std::uint16_t, SHORT, false);
MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(std::int32_t, LONG, true);
MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(std::uint32_t, LONG, false);
MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(std::int64_t, LONGLONG, true);
MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(std::uint64_t, LONGLONG, false);
MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(mysql::string_lenenc, STRING, true);
MYSQL_COMPUTE_FIELD_TYPE_IMPL_ENTRY(std::nullptr_t, NULL_, true);
std::pair<mysql::FieldType, bool> mysql::compute_field_type(const BinaryValue& v)
{
return std::visit([](auto elm) {
return compute_field_type_impl<decltype(elm)>();
}, v);
}
// Text serialization
std::ostream& mysql::operator<<(std::ostream& os, const Handshake& value)
{