From 62936fc5ea3db3a208d13b4f3711589c15949409 Mon Sep 17 00:00:00 2001 From: Kaitmazian Maksim <m.kaitmazian@picodata.io> Date: Thu, 30 May 2024 23:59:33 +0300 Subject: [PATCH] fix(pgproto): remove use_tarantool_parameter_placeholders We don't need to replace $n with question marks any more, as we support the pg parameters format. See https://git.picodata.io/picodata/picodata/sbroad/-/merge_requests/377 and https://git.picodata.io/picodata/picodata/sbroad/-/issues/543. --- src/pgproto/client/extended_query.rs | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/pgproto/client/extended_query.rs b/src/pgproto/client/extended_query.rs index c4fd06ad5d..375539a45d 100644 --- a/src/pgproto/client/extended_query.rs +++ b/src/pgproto/client/extended_query.rs @@ -8,22 +8,12 @@ use crate::pgproto::{ use pgwire::messages::extendedquery::{Bind, Close, Describe, Execute, Parse}; use std::io::{Read, Write}; -fn use_tarantool_parameter_placeholders(sql: &str) -> String { - // TODO: delete it after the pg parameters are supported, - // related issue https://git.picodata.io/picodata/picodata/pgproto/-/issues/18. - sql.replace("$1", "?") - .replace("$2", "?") - .replace("$3", "?") - .replace("$4", "?") -} - pub fn process_parse_message( stream: &mut PgStream<impl Read + Write>, backend: &Backend, parse: Parse, ) -> PgResult<()> { - let query = use_tarantool_parameter_placeholders(&parse.query); - backend.parse(parse.name, query, parse.type_oids)?; + backend.parse(parse.name, parse.query, parse.type_oids)?; stream.write_message_noflush(messages::parse_complete())?; Ok(()) } -- GitLab