diff options
| author | Michal Čihař <michal@cihar.com> | 2017-01-23 12:25:57 +0100 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2017-01-23 12:25:57 +0100 |
| commit | 50ef374ea466ad734fe687ac75e0e7986c46c1b2 (patch) | |
| tree | 66c5a5f5b4dc080cfad42154a080dfb53cb273dc /tests/Utils/FormatterTest.php | |
| parent | 5489846a6a3d3f7535a55f0c13a742cc07468af4 (diff) | |
| parent | 65f66eb7b6ca98218184f3ab39f6d0de08d7e8d8 (diff) | |
| download | sql-parser-50ef374ea466ad734fe687ac75e0e7986c46c1b2.zip sql-parser-50ef374ea466ad734fe687ac75e0e7986c46c1b2.tar.gz sql-parser-50ef374ea466ad734fe687ac75e0e7986c46c1b2.tar.bz2 | |
Merge branch 'master' into motranslator
Diffstat (limited to 'tests/Utils/FormatterTest.php')
| -rw-r--r-- | tests/Utils/FormatterTest.php | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/tests/Utils/FormatterTest.php b/tests/Utils/FormatterTest.php index 15e6336..55246e0 100644 --- a/tests/Utils/FormatterTest.php +++ b/tests/Utils/FormatterTest.php @@ -250,13 +250,36 @@ class FormatTest extends TestCase array('type' => 'html'), ), array( + 'SELECT /* Comment */ 1' . "\n" . + 'FROM tbl # Comment' . "\n" . + 'WHERE 1 -- Comment', + 'SELECT' . "\n" . + ' /* Comment */ 1' . "\n" . + 'FROM' . "\n" . + ' tbl # Comment' . "\n" . + 'WHERE' . "\n" . + ' 1 -- Comment', + array('type' => 'text'), + ), + array( 'SELECT 1 # Comment', '<span class="sql-reserved">SELECT</span>' . '<br/>' . - ' <span class="sql-number">1</span> <span class="sql-comment"># Comment' . "\n" . - '</span>', + ' <span class="sql-number">1</span> <span class="sql-comment"># Comment</span>', + array('type' => 'html'), + ), + array( + 'SELECT 1 -- comment', + '<span class="sql-reserved">SELECT</span>' . '<br/>' . + ' <span class="sql-number">1</span> <span class="sql-comment">-- comment</span>', array('type' => 'html'), ), array( + 'SELECT 1 -- comment', + '<span class="sql-reserved">SELECT</span>' . '<br/>' . + ' <span class="sql-number">1</span>', + array('type' => 'html', 'remove_comments' => true), + ), + array( 'SELECT HEX("1")', '<span class="sql-reserved">SELECT</span>' . '<br/>' . ' <span class="sql-keyword">HEX</span>(<span class="sql-string">"1"</span>)', @@ -318,19 +341,6 @@ class FormatTest extends TestCase array('type' => 'html'), ), array( - 'SELECT 1 -- comment', - '<span class="sql-reserved">SELECT</span>' . '<br/>' . - ' <span class="sql-number">1</span> <span class="sql-comment">-- comment' . "\n" . - '</span>', - array('type' => 'html'), - ), - array( - 'SELECT 1 -- comment', - '<span class="sql-reserved">SELECT</span>' . '<br/>' . - ' <span class="sql-number">1</span>', - array('type' => 'html', 'remove_comments' => true), - ), - array( 'CREATE TABLE IF NOT EXISTS `pma__bookmark` (' . "\n" . ' `id` int(11) NOT NULL auto_increment,' . "\n" . ' `dbase` varchar(255) NOT NULL default "",' . "\n" . |