Skip to content

Commit 65fb611

Browse files
committed
Fix expected format for BEGIN/END
Issue #120 Signed-off-by: Michal Čihař <[email protected]>
1 parent 108927f commit 65fb611

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

tests/Utils/FormatterTest.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -419,25 +419,31 @@ public function formatQueries()
419419
'query' => 'create procedure test_procedure() begin from tbl select *; end',
420420
'text' =>
421421
'CREATE' . "\n" .
422-
'PROCEDURE test_procedure() BEGIN' . "\n" .
422+
'PROCEDURE test_procedure()' . "\n" .
423+
'BEGIN' . "\n" .
423424
'FROM' . "\n" .
424425
' tbl' . "\n" .
425426
'SELECT' . "\n" .
426-
' *; END',
427+
' *;' . "\n" .
428+
'END',
427429
'cli' =>
428430
"\x1b[35mCREATE" . "\n" .
429-
"\x1b[35mPROCEDURE \x1b[39mtest_procedure\x1b[39m(\x1b[39m) \x1b[95mBEGIN" . "\n" .
431+
"\x1b[35mPROCEDURE \x1b[39mtest_procedure\x1b[39m(\x1b[39m)\n" .
432+
"\x1b[95mBEGIN" . "\n" .
430433
"\x1b[35mFROM" . "\n" .
431434
" \x1b[39mtbl" . "\n" .
432435
"\x1b[35mSELECT" . "\n" .
433-
" \x1b[39m*\x1b[39m; \x1b[95mEND" . "\x1b[0m",
436+
" \x1b[39m*\x1b[39m;\n" .
437+
"\x1b[95mEND" . "\x1b[0m",
434438
'html' =>
435439
'<span class="sql-reserved">CREATE</span>' . '<br/>' .
436-
'<span class="sql-reserved">PROCEDURE</span> test_procedure() <span class="sql-keyword">BEGIN</span>' . '<br/>' .
440+
'<span class="sql-reserved">PROCEDURE</span> test_procedure()' . '<br/>' .
441+
'<span class="sql-keyword">BEGIN</span>' . '<br/>' .
437442
'<span class="sql-reserved">FROM</span>' . '<br/>' .
438443
'&nbsp;&nbsp;&nbsp;&nbsp;tbl' . '<br/>' .
439444
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
440-
'&nbsp;&nbsp;&nbsp;&nbsp;*; <span class="sql-keyword">END</span>',
445+
'&nbsp;&nbsp;&nbsp;&nbsp;*;' . '<br/>' .
446+
'<span class="sql-keyword">END</span>',
441447
),
442448
'insert' => array(
443449
'query' => 'insert into foo values (0, 0, 0), (1, 1, 1)',

0 commit comments

Comments
 (0)