From 32fd2605533008d98304f8b01bb601d4ba6a7008 Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Wed, 16 Oct 2024 01:06:32 +0000
Subject: [PATCH] [misc] add unit test:trimsemicolon.

---
 module/pivot/model.php                    |  2 +-
 module/pivot/test/model/trimsemicolon.php | 36 +++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100755 module/pivot/test/model/trimsemicolon.php

diff --git a/module/pivot/model.php b/module/pivot/model.php
index fead5fa4d5..3eb3b195e2 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -804,7 +804,7 @@ class pivotModel extends model
      */
     public function trimSemicolon(string $sql): string
     {
-        return str_replace(';', '', $sql);
+        return trim($sql, " ;");
     }
 
     /**
diff --git a/module/pivot/test/model/trimsemicolon.php b/module/pivot/test/model/trimsemicolon.php
new file mode 100755
index 0000000000..c0c5aa557a
--- /dev/null
+++ b/module/pivot/test/model/trimsemicolon.php
@@ -0,0 +1,36 @@
+#!/usr/bin/env php
+<?php
+
+/**
+
+title=测试 pivotModel->trimSemicolon().
+timeout=0
+cid=1
+
+- 测试末尾存在分号。 @select id,name from zt_project
+
+- 测试末尾存在空格。 @select id,name from zt_project
+
+- 测试末尾存在多个分号。 @select id,name from zt_project
+
+- 测试末尾存在多个空格。 @select id,name from zt_project
+
+- 测试末尾存在分号和空格。 @select id,name from zt_project
+
+- 测试末尾存在空格和分号。 @select id,name from zt_project
+
+*/
+
+include dirname(__FILE__, 5) . '/test/lib/init.php';
+include dirname(__FILE__, 2) . '/lib/pivot.unittest.class.php';
+
+$pivot = new pivotTest();
+
+$sql = 'select id,name from zt_user;;;;;;;;;;;;';
+
+r($pivot->trimSemicolon('select id,name from zt_project;'))    && p() && e('select id,name from zt_project'); // 测试末尾存在分号。
+r($pivot->trimSemicolon('select id,name from zt_project '))    && p() && e('select id,name from zt_project'); // 测试末尾存在空格。
+r($pivot->trimSemicolon('select id,name from zt_project;;;'))  && p() && e('select id,name from zt_project'); // 测试末尾存在多个分号。
+r($pivot->trimSemicolon('select id,name from zt_project   '))  && p() && e('select id,name from zt_project'); // 测试末尾存在多个空格。
+r($pivot->trimSemicolon('select id,name from zt_project;   ')) && p() && e('select id,name from zt_project'); // 测试末尾存在分号和空格。
+r($pivot->trimSemicolon('select id,name from zt_project   ;')) && p() && e('select id,name from zt_project'); // 测试末尾存在空格和分号。
\ No newline at end of file