From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id B4515440F3F for ; Thu, 7 Nov 2019 04:05:06 +0300 (MSK) From: Nikita Pettik Date: Thu, 7 Nov 2019 04:04:49 +0300 Message-Id: <20191107010455.64457-10-korablev@tarantool.org> In-Reply-To: <20191107010455.64457-1-korablev@tarantool.org> References: <20191107010455.64457-1-korablev@tarantool.org> Subject: [Tarantool-patches] [PATCH 09/15] sql: resurrect sql_bind_parameter_name() List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: v.shpilevoy@tarantool.org We may need to get name of parameter to be bound by its index position. So let's resurrect sql_bind_parameter_name() - put its prototype to sql/sqlInt.h header and update codestyle. Need for #2592 --- src/box/sql/sqlInt.h | 7 +++++++ src/box/sql/vdbeapi.c | 14 ++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index e6d8bc2e3..1c02bd972 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -685,6 +685,13 @@ sql_bind_zeroblob64(sql_stmt *, int, int sql_bind_parameter_count(sql_stmt *stmt); +/** + * Return the name of a wildcard parameter. Return NULL if the index + * is out of range or if the wildcard is unnamed. + */ +const char * +sql_bind_parameter_name(sql_stmt *stmt, int i); + /** * Perform pointer parameter binding for the prepared sql * statement. diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 93b8906e5..482a42288 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -1058,18 +1058,12 @@ sql_bind_parameter_count(sql_stmt *stmt) return p->nVar; } -/* - * Return the name of a wildcard parameter. Return NULL if the index - * is out of range or if the wildcard is unnamed. - * - * The result is always UTF-8. - */ const char * -sql_bind_parameter_name(sql_stmt * pStmt, int i) +sql_bind_parameter_name(sql_stmt *stmt, int i) { - Vdbe *p = (Vdbe *) pStmt; - if (p == 0) - return 0; + struct Vdbe *p = (struct Vdbe *) stmt; + if (p == NULL) + return NULL; return sqlVListNumToName(p->pVList, i); } -- 2.15.1