Output rawSql() for execute() method (#230)

Tigrov · web-flow · commit d227ecdd752a · 2023-11-07T17:51:48.000+07:00
diff --git a/src/MigrationBuilder.php b/src/MigrationBuilder.php
@@ -20,6 +20,7 @@
 use function rtrim;
 use function sprintf;
 use function substr;
+use function trim;
 
 final class MigrationBuilder extends AbstractMigrationBuilder
 {
@@ -52,13 +53,15 @@ public function getDb(): ConnectionInterface
      */
     public function execute(string $sql, array $params = []): void
     {
-        $sqlOutput = $sql;
-        if ($this->maxSqlOutputLength !== null && $this->maxSqlOutputLength < strlen($sql)) {
-            $sqlOutput = ltrim(rtrim(substr($sql, 0, $this->maxSqlOutputLength)) . ' [... hidden]');
+        $command = $this->db->createCommand($sql)->bindValues($params);
+        $sqlOutput = trim($command->getRawSql());
+
+        if ($this->maxSqlOutputLength !== null && $this->maxSqlOutputLength < strlen($sqlOutput)) {
+            $sqlOutput = ltrim(rtrim(substr($sqlOutput, 0, $this->maxSqlOutputLength)) . ' [... hidden]');
         }
 
         $time = $this->beginCommand("Execute SQL: $sqlOutput");
-        $this->db->createCommand($sql)->bindValues($params)->execute();
+        $command->execute();
         $this->endCommand($time);
     }
 
diff --git a/tests/Common/AbstractMigrationBuilderTest.php b/tests/Common/AbstractMigrationBuilderTest.php
@@ -31,10 +31,14 @@ protected function setUp(): void
     public function testExecute(): void
     {
         $this->builder->createTable('test', ['id' => $this->builder->integer()]);
-        $this->builder->execute('DROP TABLE {{test}}');
+
+        $sql = 'DROP TABLE {{test}}';
+        $this->builder->execute($sql);
+
+        $sqlOutput = $this->db->getQuoter()->quoteSql($sql);
 
         $this->assertEmpty($this->db->getTableSchema('test_table'));
-        $this->assertInformerOutputContains('    > Execute SQL: DROP TABLE {{test}} ... Done in ');
+        $this->assertInformerOutputContains("    > Execute SQL: $sqlOutput ... Done in ");
     }
 
     public function testInsert(): void
diff --git a/tests/Support/Migrations/M231015155500ExecuteSql.php b/tests/Support/Migrations/M231015155500ExecuteSql.php
@@ -17,7 +17,7 @@ public function up(MigrationBuilder $b): void
     {
         $b->execute(
             <<<SQL
-            CREATE TABLE person (
+              CREATE TABLE person (
                 id INT,
                 first_name VARCHAR(100),
                 last_name VARCHAR(100)

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`use function rtrim;`
`21`	`21`	`use function sprintf;`
`22`	`22`	`use function substr;`
	`23`	`+use function trim;`
`23`	`24`
`24`	`25`	`final class MigrationBuilder extends AbstractMigrationBuilder`
`25`	`26`	`{`
`@@ -52,13 +53,15 @@ public function getDb(): ConnectionInterface`
`52`	`53`	`*/`
`53`	`54`	`public function execute(string $sql, array $params = []): void`
`54`	`55`	`{`
`55`		`- $sqlOutput = $sql;`
`56`		`- if ($this->maxSqlOutputLength !== null && $this->maxSqlOutputLength < strlen($sql)) {`
`57`		`- $sqlOutput = ltrim(rtrim(substr($sql, 0, $this->maxSqlOutputLength)) . ' [... hidden]');`
	`56`	`+ $command = $this->db->createCommand($sql)->bindValues($params);`
	`57`	`+ $sqlOutput = trim($command->getRawSql());`
	`58`	`+`
	`59`	`+ if ($this->maxSqlOutputLength !== null && $this->maxSqlOutputLength < strlen($sqlOutput)) {`
	`60`	`+ $sqlOutput = ltrim(rtrim(substr($sqlOutput, 0, $this->maxSqlOutputLength)) . ' [... hidden]');`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`$time = $this->beginCommand("Execute SQL: $sqlOutput");`
`61`		`- $this->db->createCommand($sql)->bindValues($params)->execute();`
	`64`	`+ $command->execute();`
`62`	`65`	`$this->endCommand($time);`
`63`	`66`	`}`
`64`	`67`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function up(MigrationBuilder $b): void`
`17`	`17`	`{`
`18`	`18`	`$b->execute(`
`19`	`19`	`<<<SQL`
`20`		`- CREATE TABLE person (`
	`20`	`+ CREATE TABLE person (`
`21`	`21`	`id INT,`
`22`	`22`	`first_name VARCHAR(100),`
`23`	`23`	`last_name VARCHAR(100)`