Skip to content

Commit 56070be

Browse files
greg0iregreg0ire
authored
Merge pull request #61 from MaximilianKresse/fix/formatting
Fixed formatting of MODIFY and CHANGE
2 parents 5514662 + 96221ff commit 56070be

File tree

7 files changed

+54
-29
lines changed

7 files changed

+54
-29
lines changed

‎src/Tokenizer.php

100644100755
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ final class Tokenizer
3131
private $reserved = [
3232
'ACCESSIBLE',
3333
'ACTION',
34+
'AFTER',
3435
'AGAINST',
3536
'AGGREGATE',
3637
'ALGORITHM',
@@ -174,7 +175,6 @@ final class Tokenizer
174175
'MINUTE_SECOND',
175176
'MIN_ROWS',
176177
'MODE',
177-
'MODIFY',
178178
'MONTH',
179179
'MRG_MYISAM',
180180
'MYISAM',
@@ -319,7 +319,8 @@ final class Tokenizer
319319
'UPDATE',
320320
'HAVING',
321321
'ADD',
322-
'AFTER',
322+
'CHANGE',
323+
'MODIFY',
323324
'ALTER TABLE',
324325
'DELETE FROM',
325326
'UNION ALL',

‎tests/clihighlight.html

100644100755
Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,7 @@
454454
ALTER TABLE
455455
`PREFIX_employee`
456456
ADD
457-
`bo_color` varchar(32) default NULL
458-
AFTER
459-
`stats_date_to`
457+
`bo_color` varchar(32) default NULL AFTER `stats_date_to`
460458
---
461459
INSERT INTO `PREFIX_cms_category_lang`
462460
VALUES
@@ -477,16 +475,12 @@
477475
ALTER TABLE
478476
`PREFIX_customer`
479477
ADD
480-
`note` text
481-
AFTER
482-
`secure_key`
478+
`note` text AFTER `secure_key`
483479
---
484480
ALTER TABLE
485481
`PREFIX_contact`
486482
ADD
487-
`customer_service` tinyint(1) NOT NULL DEFAULT 0
488-
AFTER
489-
`email`
483+
`customer_service` tinyint(1) NOT NULL DEFAULT 0 AFTER `email`
490484
---
491485
INSERT INTO `PREFIX_specific_price` (
492486
`id_product`, `id_shop`, `id_currency`,
@@ -757,6 +751,16 @@
757751
(SomeOtherColumn = 2);
758752
WARNING: unclosed parentheses or section
759753
---
754+
ALTER TABLE
755+
`test_modify`
756+
MODIFY
757+
`id` INT(11) UNSIGNED NOT NULL;
758+
---
759+
ALTER TABLE
760+
`test_change`
761+
CHANGE
762+
`id` `_id` BIGINT(20) UNSIGNED NULL;
763+
---
760764
SELECT
761765
*
762766
LIMIT

‎tests/compress.html

100644100755
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
---
6767
SELECT Test FROM Test WHERE ( MyColumn = 1 )) AND ((( SomeOtherColumn = 2);
6868
---
69+
ALTER TABLE `test_modify` MODIFY `id` INT(11) UNSIGNED NOT NULL;
70+
---
71+
ALTER TABLE `test_change` CHANGE `id` `_id` BIGINT(20) UNSIGNED NULL;
72+
---
6973
SELECT * LIMIT 1; SELECT a,b,c,d FROM e LIMIT 1, 2; SELECT 1,2,3 WHERE a in (1,2,3,4,5) and b=5;
7074
---
7175
SELECT count - 50 WHERE a-50 = b WHERE 1 and - 50 WHERE -50 = a WHERE a = -50 WHERE 1 - 50 WHERE 1 and -50;

‎tests/format-highlight.html

100644100755
Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,7 @@
454454
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">ALTER TABLE</span>
455455
<span style="color: purple;">`PREFIX_employee`</span>
456456
<span style="font-weight:bold;">ADD</span>
457-
<span style="color: purple;">`bo_color`</span> <span style="color: #333;">varchar</span>(<span style="color: green;">32</span>) <span style="font-weight:bold;">default</span> <span style="font-weight:bold;">NULL</span>
458-
<span style="font-weight:bold;">AFTER</span>
459-
<span style="color: purple;">`stats_date_to`</span></pre>
457+
<span style="color: purple;">`bo_color`</span> <span style="color: #333;">varchar</span>(<span style="color: green;">32</span>) <span style="font-weight:bold;">default</span> <span style="font-weight:bold;">NULL</span> <span style="font-weight:bold;">AFTER</span> <span style="color: purple;">`stats_date_to`</span></pre>
460458
---
461459
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_cms_category_lang`</span>
462460
<span style="font-weight:bold;">VALUES</span>
@@ -477,16 +475,12 @@
477475
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">ALTER TABLE</span>
478476
<span style="color: purple;">`PREFIX_customer`</span>
479477
<span style="font-weight:bold;">ADD</span>
480-
<span style="color: purple;">`note`</span> <span style="color: #333;">text</span>
481-
<span style="font-weight:bold;">AFTER</span>
482-
<span style="color: purple;">`secure_key`</span></pre>
478+
<span style="color: purple;">`note`</span> <span style="color: #333;">text</span> <span style="font-weight:bold;">AFTER</span> <span style="color: purple;">`secure_key`</span></pre>
483479
---
484480
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">ALTER TABLE</span>
485481
<span style="color: purple;">`PREFIX_contact`</span>
486482
<span style="font-weight:bold;">ADD</span>
487-
<span style="color: purple;">`customer_service`</span> <span style="color: #333;">tinyint</span>(<span style="color: green;">1</span>) <span style="font-weight:bold;">NOT</span> <span style="font-weight:bold;">NULL</span> <span style="font-weight:bold;">DEFAULT</span> <span style="color: green;">0</span>
488-
<span style="font-weight:bold;">AFTER</span>
489-
<span style="color: purple;">`email`</span></pre>
483+
<span style="color: purple;">`customer_service`</span> <span style="color: #333;">tinyint</span>(<span style="color: green;">1</span>) <span style="font-weight:bold;">NOT</span> <span style="font-weight:bold;">NULL</span> <span style="font-weight:bold;">DEFAULT</span> <span style="color: green;">0</span> <span style="font-weight:bold;">AFTER</span> <span style="color: purple;">`email`</span></pre>
490484
---
491485
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">INSERT</span> <span style="font-weight:bold;">INTO</span> <span style="color: purple;">`PREFIX_specific_price`</span> (
492486
<span style="color: purple;">`id_product`</span><span >,</span> <span style="color: purple;">`id_shop`</span><span >,</span> <span style="color: purple;">`id_currency`</span><span >,</span>
@@ -757,6 +751,16 @@
757751
(<span style="color: #333;">SomeOtherColumn</span> <span >=</span> <span style="color: green;">2</span>)<span >;</span>
758752
<span style="background-color: red;">WARNING: unclosed parentheses or section</span></pre>
759753
---
754+
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">ALTER TABLE</span>
755+
<span style="color: purple;">`test_modify`</span>
756+
<span style="font-weight:bold;">MODIFY</span>
757+
<span style="color: purple;">`id`</span> <span style="color: #333;">INT</span>(<span style="color: green;">11</span>) <span style="font-weight:bold;">UNSIGNED</span> <span style="font-weight:bold;">NOT</span> <span style="font-weight:bold;">NULL</span><span >;</span></pre>
758+
---
759+
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">ALTER TABLE</span>
760+
<span style="color: purple;">`test_change`</span>
761+
<span style="font-weight:bold;">CHANGE</span>
762+
<span style="color: purple;">`id`</span> <span style="color: purple;">`_id`</span> <span style="color: #333;">BIGINT</span>(<span style="color: green;">20</span>) <span style="font-weight:bold;">UNSIGNED</span> <span style="font-weight:bold;">NULL</span><span >;</span></pre>
763+
---
760764
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span>
761765
<span >*</span>
762766
<span style="font-weight:bold;">LIMIT</span>

‎tests/format.html

100644100755
Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,7 @@
454454
ALTER TABLE
455455
`PREFIX_employee`
456456
ADD
457-
`bo_color` varchar(32) default NULL
458-
AFTER
459-
`stats_date_to`
457+
`bo_color` varchar(32) default NULL AFTER `stats_date_to`
460458
---
461459
INSERT INTO `PREFIX_cms_category_lang`
462460
VALUES
@@ -477,16 +475,12 @@
477475
ALTER TABLE
478476
`PREFIX_customer`
479477
ADD
480-
`note` text
481-
AFTER
482-
`secure_key`
478+
`note` text AFTER `secure_key`
483479
---
484480
ALTER TABLE
485481
`PREFIX_contact`
486482
ADD
487-
`customer_service` tinyint(1) NOT NULL DEFAULT 0
488-
AFTER
489-
`email`
483+
`customer_service` tinyint(1) NOT NULL DEFAULT 0 AFTER `email`
490484
---
491485
INSERT INTO `PREFIX_specific_price` (
492486
`id_product`, `id_shop`, `id_currency`,
@@ -755,6 +749,16 @@
755749
(
756750
(SomeOtherColumn = 2); WARNING: unclosed parentheses or section
757751
---
752+
ALTER TABLE
753+
`test_modify`
754+
MODIFY
755+
`id` INT(11) UNSIGNED NOT NULL;
756+
---
757+
ALTER TABLE
758+
`test_change`
759+
CHANGE
760+
`id` `_id` BIGINT(20) UNSIGNED NULL;
761+
---
758762
SELECT
759763
*
760764
LIMIT

‎tests/highlight.html

100644100755
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@
245245
(
246246
<span style="color: #333;">MyColumn</span> <span >=</span> <span style="color: green;">1</span> )) <span style="font-weight:bold;">AND</span> ((( <span style="color: #333;">SomeOtherColumn</span> <span >=</span> <span style="color: green;">2</span>)<span >;</span></pre>
247247
---
248+
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">ALTER TABLE</span> <span style="color: purple;">`test_modify`</span> <span style="font-weight:bold;">MODIFY</span> <span style="color: purple;">`id`</span> <span style="color: #333;">INT</span>(<span style="color: green;">11</span>) <span style="font-weight:bold;">UNSIGNED</span> <span style="font-weight:bold;">NOT</span> <span style="font-weight:bold;">NULL</span><span >;</span></pre>
249+
---
250+
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">ALTER TABLE</span> <span style="color: purple;">`test_change`</span> <span style="font-weight:bold;">CHANGE</span> <span style="color: purple;">`id`</span> <span style="color: purple;">`_id`</span> <span style="color: #333;">BIGINT</span>(<span style="color: green;">20</span>) <span style="font-weight:bold;">UNSIGNED</span> <span style="font-weight:bold;">NULL</span><span >;</span></pre>
251+
---
248252
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> <span >*</span> <span style="font-weight:bold;">LIMIT</span> <span style="color: green;">1</span><span >;</span> <span style="font-weight:bold;">SELECT</span> <span style="color: #333;">a</span><span >,</span><span style="color: #333;">b</span><span >,</span><span style="color: #333;">c</span><span >,</span><span style="color: #333;">d</span> <span style="font-weight:bold;">FROM</span> <span style="color: #333;">e</span> <span style="font-weight:bold;">LIMIT</span> <span style="color: green;">1</span><span >,</span> <span style="color: green;">2</span><span >;</span> <span style="font-weight:bold;">SELECT</span> <span style="color: green;">1</span><span >,</span><span style="color: green;">2</span><span >,</span><span style="color: green;">3</span> <span style="font-weight:bold;">WHERE</span> <span style="color: #333;">a</span> <span style="font-weight:bold;">in</span> (<span style="color: green;">1</span><span >,</span><span style="color: green;">2</span><span >,</span><span style="color: green;">3</span><span >,</span><span style="color: green;">4</span><span >,</span><span style="color: green;">5</span>) <span style="font-weight:bold;">and</span> <span style="color: #333;">b</span><span >=</span><span style="color: green;">5</span><span >;</span></pre>
249253
---
250254
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> <span style="color: #333;">count</span> <span >-</span> <span style="color: green;">50</span>

‎tests/sql.sql

100644100755
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ SELECT Test FROM Test WHERE
245245
(
246246
MyColumn = 1 )) AND ((( SomeOtherColumn = 2);
247247
---
248+
ALTER TABLE `test_modify` MODIFY `id` INT(11) UNSIGNED NOT NULL;
249+
---
250+
ALTER TABLE `test_change` CHANGE `id` `_id` BIGINT(20) UNSIGNED NULL;
251+
---
248252
SELECT * LIMIT 1; SELECT a,b,c,d FROM e LIMIT 1, 2; SELECT 1,2,3 WHERE a in (1,2,3,4,5) and b=5;
249253
---
250254
SELECT count - 50

0 commit comments

Comments
 (0)