From 981d07fd1c099780e6c77abd6dfb6508c1533a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=B5=B7=E9=9B=84?= Date: Tue, 23 Aug 2022 05:23:47 +0000 Subject: [PATCH 1/4] rename statement.h to statement.. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 罗海雄 --- statement.h => statement. | 1 + 1 file changed, 1 insertion(+) rename statement.h => statement. (99%) diff --git a/statement.h b/statement. similarity index 99% rename from statement.h rename to statement. index 9d7f0ed..e78ea40 100644 --- a/statement.h +++ b/statement. @@ -113,6 +113,7 @@ enum ,STMT_TYPE_CLOSE ,STMT_TYPE_INSERT ,STMT_TYPE_UPDATE + ,STMT_TYPE_MERGE ,STMT_TYPE_DELETE ,STMT_TYPE_CREATE ,STMT_TYPE_ALTER -- Gitee From fe569c469127be781d0d763370bf5b1966ebbeb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=B5=B7=E9=9B=84?= Date: Tue, 23 Aug 2022 05:24:18 +0000 Subject: [PATCH 2/4] rename statement. to statement.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 罗海雄 --- statement. => statement.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename statement. => statement.h (100%) diff --git a/statement. b/statement.h similarity index 100% rename from statement. rename to statement.h -- Gitee From 46a0bbbffc346ea56dddba80232c0180251d9fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=B5=B7=E9=9B=84?= Date: Tue, 23 Aug 2022 05:25:55 +0000 Subject: [PATCH 3/4] update statement.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 罗海雄 --- statement.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/statement.c b/statement.c index a6404b6..9fcca8f 100644 --- a/statement.c +++ b/statement.c @@ -54,6 +54,9 @@ static const struct ,{ STMT_TYPE_UPDATE, "UPDATE" } + ,{ + STMT_TYPE_MERGE, "MERGE" + } ,{ STMT_TYPE_DELETE, "DELETE" } @@ -3289,6 +3292,7 @@ BOOL SC_CanUseBatchProto(const StatementClass *self) if (st == STMT_TYPE_INSERT || st == STMT_TYPE_UPDATE || + st == STMT_TYPE_MERGE || st == STMT_TYPE_DELETE) return TRUE; -- Gitee From 8bcceb69376b7ddb010abe944fdd8611e45b859a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=B5=B7=E9=9B=84?= Date: Tue, 23 Aug 2022 05:29:43 +0000 Subject: [PATCH 4/4] update statement.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 罗海雄 --- statement.c | 1 + 1 file changed, 1 insertion(+) diff --git a/statement.c b/statement.c index 9fcca8f..c59b74c 100644 --- a/statement.c +++ b/statement.c @@ -3253,6 +3253,7 @@ MYLOG(0, "leaving cvtlen=" FORMAT_SIZE_T " ix(bl,of)=%d(%d,%d)\n", cvtlen, pg_bm * - binded parameter sets count should be greater than 1. * - binded parameter sets should not be all ignored. * - INSERT/UPDATE/DELETE commands enabled. + * - MERGE commands enabled. By haixiong.luo@enmotech.com 20220823 */ BOOL SC_CanUseBatchProto(const StatementClass *self) { -- Gitee