Skip to content

Commit 93b8856

Browse files
authored
Trim trailing semicolon before executing query (#2344)
1 parent 5bad109 commit 93b8856

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
n=$((n+1))
9292
sleep 2
9393
done
94-
mysql -h 127.0.0.1 -u root -proot -D phinx -e 'SELECT 1;'
94+
mysql -h 127.0.0.1 -u root -proot -D phinx -e 'SELECT 1'
9595
fi
9696
if [[ ${{ matrix.db-type }} == 'pgsql' ]]; then psql -c 'CREATE DATABASE phinx;' postgresql://postgres:postgres@127.0.0.1; fi
9797

src/Phinx/Db/Adapter/PdoAdapter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ abstract public function disconnect(): void;
197197
*/
198198
public function execute(string $sql, array $params = []): int
199199
{
200-
$sql = rtrim($sql, "; \t\n\r\0\x0B") . ';';
201-
$this->verboseLog($sql);
200+
$sql = rtrim($sql, "; \t\n\r\0\x0B");
201+
$this->verboseLog($sql . ';');
202202

203203
if ($this->isDryRunEnabled()) {
204204
return 0;

tests/Phinx/Db/Adapter/PdoAdapterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public function testExecuteCanBeCalled()
188188
{
189189
/** @var \PDO&\PHPUnit\Framework\MockObject\MockObject $pdo */
190190
$pdo = $this->getMockBuilder(PDO::class)->disableOriginalConstructor()->onlyMethods(['exec'])->getMock();
191-
$pdo->expects($this->once())->method('exec')->with('SELECT 1;')->will($this->returnValue(1));
191+
$pdo->expects($this->once())->method('exec')->with('SELECT 1')->will($this->returnValue(1));
192192

193193
$this->adapter->setConnection($pdo);
194194
$this->adapter->execute('SELECT 1');
@@ -198,7 +198,7 @@ public function testExecuteRightTrimsSemiColons()
198198
{
199199
/** @var \PDO&\PHPUnit\Framework\MockObject\MockObject $pdo */
200200
$pdo = $this->getMockBuilder(PDO::class)->disableOriginalConstructor()->onlyMethods(['exec'])->getMock();
201-
$pdo->expects($this->once())->method('exec')->with('SELECT 1;')->will($this->returnValue(1));
201+
$pdo->expects($this->once())->method('exec')->with('SELECT 1')->will($this->returnValue(1));
202202

203203
$this->adapter->setConnection($pdo);
204204
$this->adapter->execute('SELECT 1;;');

0 commit comments

Comments
 (0)