Skip to content

Commit f668301

Browse files
mvorisekmvorisek
authored
"NOW()" is like any other function like "XYZ()" (#102)
1 parent d1ac84a commit f668301

File tree

5 files changed

+156
-63
lines changed

5 files changed

+156
-63
lines changed

‎src/Tokenizer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ final class Tokenizer
184184
'NATURAL',
185185
'NO OTHERS',
186186
'NOT',
187-
'NOW()',
188187
'NULL',
189188
'OFFSET',
190189
'ON',
@@ -563,6 +562,7 @@ final class Tokenizer
563562
'MULTIPOLYGONFROMTEXT',
564563
'MULTIPOLYGONFROMWKB',
565564
'NAME_CONST',
565+
'NOW',
566566
'NTH_VALUE',
567567
'NTILE',
568568
'NULLIF',

‎tests/clihighlight.html‎

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,15 @@
465465
---
466466
INSERT INTO `PREFIX_cms_category`
467467
VALUES
468-
(1, 0, 0, 1, NOW(), NOW(), 0)
468+
(
469+
1,
470+
0,
471+
0,
472+
1,
473+
NOW(),
474+
NOW(),
475+
0
476+
)
469477
---
470478
UPDATE
471479
`PREFIX_cms_category`
@@ -571,39 +579,62 @@
571579
(
572580
'PS_SPECIFIC_PRICE_PRIORITIES',
573581
'id_shop;id_currency;id_country;id_group',
574-
NOW(), NOW()
582+
NOW(),
583+
NOW()
584+
),
585+
(
586+
'PS_TAX_DISPLAY',
587+
0,
588+
NOW(),
589+
NOW()
575590
),
576-
('PS_TAX_DISPLAY', 0, NOW(), NOW()),
577591
(
578-
'PS_SMARTY_FORCE_COMPILE', 1, NOW(),
579-
NOW()
592+
'PS_SMARTY_FORCE_COMPILE',
593+
1,
594+
NOW(),
595+
NOW()
580596
),
581597
(
582-
'PS_DISTANCE_UNIT', 'km', NOW(), NOW()
598+
'PS_DISTANCE_UNIT',
599+
'km',
600+
NOW(),
601+
NOW()
583602
),
584603
(
585-
'PS_STORES_DISPLAY_CMS', 0, NOW(),
586-
NOW()
604+
'PS_STORES_DISPLAY_CMS',
605+
0,
606+
NOW(),
607+
NOW()
587608
),
588609
(
589-
'PS_STORES_DISPLAY_FOOTER', 0, NOW(),
590-
NOW()
610+
'PS_STORES_DISPLAY_FOOTER',
611+
0,
612+
NOW(),
613+
NOW()
591614
),
592615
(
593-
'PS_STORES_SIMPLIFIED', 0, NOW(),
594-
NOW()
616+
'PS_STORES_SIMPLIFIED',
617+
0,
618+
NOW(),
619+
NOW()
595620
),
596621
(
597622
'PS_STATSDATA_CUSTOMER_PAGESVIEWS',
598-
1, NOW(), NOW()
623+
1,
624+
NOW(),
625+
NOW()
599626
),
600627
(
601-
'PS_STATSDATA_PAGESVIEWS', 1, NOW(),
602-
NOW()
628+
'PS_STATSDATA_PAGESVIEWS',
629+
1,
630+
NOW(),
631+
NOW()
603632
),
604633
(
605-
'PS_STATSDATA_PLUGINS', 1, NOW(),
606-
NOW()
634+
'PS_STATSDATA_PLUGINS',
635+
1,
636+
NOW(),
637+
NOW()
607638
)
608639
---
609640
INSERT INTO `PREFIX_configuration` (
@@ -623,8 +654,8 @@
623654
),
624655
0
625656
),
626-
[37mNOW()[0m,[0m
627-
[37mNOW()[0m
657+
[37mNOW[0m(),[0m
658+
[37mNOW[0m()
628659
)
629660
---
630661
CREATE TEMPORARY TABLE `PREFIX_configuration_tmp` (`value` text)

‎tests/format-highlight.html‎

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,15 @@
465465
---
466466
<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`</span>
467467
<span style="font-weight:bold;">VALUES</span>
468-
(<span style="color: green;">1</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="color: green;">0</span>)</pre>
468+
(
469+
<span style="color: green;">1</span><span >,</span>
470+
<span style="color: green;">0</span><span >,</span>
471+
<span style="color: green;">0</span><span >,</span>
472+
<span style="color: green;">1</span><span >,</span>
473+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
474+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
475+
<span style="color: green;">0</span>
476+
)</pre>
469477
---
470478
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">UPDATE</span>
471479
<span style="color: purple;">`PREFIX_cms_category`</span>
@@ -571,39 +579,62 @@
571579
(
572580
<span style="color: blue;">'PS_SPECIFIC_PRICE_PRIORITIES'</span><span >,</span>
573581
<span style="color: blue;">'id_shop;id_currency;id_country;id_group'</span><span >,</span>
574-
<span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>
582+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
583+
<span style="font-weight:bold;">NOW</span>()
584+
)<span >,</span>
585+
(
586+
<span style="color: blue;">'PS_TAX_DISPLAY'</span><span >,</span>
587+
<span style="color: green;">0</span><span >,</span>
588+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
589+
<span style="font-weight:bold;">NOW</span>()
575590
)<span >,</span>
576-
(<span style="color: blue;">'PS_TAX_DISPLAY'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>)<span >,</span>
577591
(
578-
<span style="color: blue;">'PS_SMARTY_FORCE_COMPILE'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
579-
<span style="font-weight:bold;">NOW()</span>
592+
<span style="color: blue;">'PS_SMARTY_FORCE_COMPILE'</span><span >,</span>
593+
<span style="color: green;">1</span><span >,</span>
594+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
595+
<span style="font-weight:bold;">NOW</span>()
580596
)<span >,</span>
581597
(
582-
<span style="color: blue;">'PS_DISTANCE_UNIT'</span><span >,</span> <span style="color: blue;">'km'</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>
598+
<span style="color: blue;">'PS_DISTANCE_UNIT'</span><span >,</span>
599+
<span style="color: blue;">'km'</span><span >,</span>
600+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
601+
<span style="font-weight:bold;">NOW</span>()
583602
)<span >,</span>
584603
(
585-
<span style="color: blue;">'PS_STORES_DISPLAY_CMS'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
586-
<span style="font-weight:bold;">NOW()</span>
604+
<span style="color: blue;">'PS_STORES_DISPLAY_CMS'</span><span >,</span>
605+
<span style="color: green;">0</span><span >,</span>
606+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
607+
<span style="font-weight:bold;">NOW</span>()
587608
)<span >,</span>
588609
(
589-
<span style="color: blue;">'PS_STORES_DISPLAY_FOOTER'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
590-
<span style="font-weight:bold;">NOW()</span>
610+
<span style="color: blue;">'PS_STORES_DISPLAY_FOOTER'</span><span >,</span>
611+
<span style="color: green;">0</span><span >,</span>
612+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
613+
<span style="font-weight:bold;">NOW</span>()
591614
)<span >,</span>
592615
(
593-
<span style="color: blue;">'PS_STORES_SIMPLIFIED'</span><span >,</span> <span style="color: green;">0</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
594-
<span style="font-weight:bold;">NOW()</span>
616+
<span style="color: blue;">'PS_STORES_SIMPLIFIED'</span><span >,</span>
617+
<span style="color: green;">0</span><span >,</span>
618+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
619+
<span style="font-weight:bold;">NOW</span>()
595620
)<span >,</span>
596621
(
597622
<span style="color: blue;">'PS_STATSDATA_CUSTOMER_PAGESVIEWS'</span><span >,</span>
598-
<span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>
623+
<span style="color: green;">1</span><span >,</span>
624+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
625+
<span style="font-weight:bold;">NOW</span>()
599626
)<span >,</span>
600627
(
601-
<span style="color: blue;">'PS_STATSDATA_PAGESVIEWS'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
602-
<span style="font-weight:bold;">NOW()</span>
628+
<span style="color: blue;">'PS_STATSDATA_PAGESVIEWS'</span><span >,</span>
629+
<span style="color: green;">1</span><span >,</span>
630+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
631+
<span style="font-weight:bold;">NOW</span>()
603632
)<span >,</span>
604633
(
605-
<span style="color: blue;">'PS_STATSDATA_PLUGINS'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="font-weight:bold;">NOW()</span><span >,</span>
606-
<span style="font-weight:bold;">NOW()</span>
634+
<span style="color: blue;">'PS_STATSDATA_PLUGINS'</span><span >,</span>
635+
<span style="color: green;">1</span><span >,</span>
636+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
637+
<span style="font-weight:bold;">NOW</span>()
607638
)</pre>
608639
---
609640
<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_configuration`</span> (
@@ -623,8 +654,8 @@
623654
)<span >,</span>
624655
<span style="color: green;">0</span>
625656
)<span >,</span>
626-
<span style="font-weight:bold;">NOW()</span><span >,</span>
627-
<span style="font-weight:bold;">NOW()</span>
657+
<span style="font-weight:bold;">NOW</span>()<span >,</span>
658+
<span style="font-weight:bold;">NOW</span>()
628659
)</pre>
629660
---
630661
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">CREATE</span> <span style="font-weight:bold;">TEMPORARY</span> <span style="font-weight:bold;">TABLE</span> <span style="color: purple;">`PREFIX_configuration_tmp`</span> (<span style="color: purple;">`value`</span> <span style="color: #333;">text</span>)</pre>

‎tests/format.html‎

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,15 @@
465465
---
466466
INSERT INTO `PREFIX_cms_category`
467467
VALUES
468-
(1, 0, 0, 1, NOW(), NOW(), 0)
468+
(
469+
1,
470+
0,
471+
0,
472+
1,
473+
NOW(),
474+
NOW(),
475+
0
476+
)
469477
---
470478
UPDATE
471479
`PREFIX_cms_category`
@@ -571,38 +579,61 @@
571579
(
572580
'PS_SPECIFIC_PRICE_PRIORITIES',
573581
'id_shop;id_currency;id_country;id_group',
574-
NOW(), NOW()
582+
NOW(),
583+
NOW()
584+
),
585+
(
586+
'PS_TAX_DISPLAY',
587+
0,
588+
NOW(),
589+
NOW()
575590
),
576-
('PS_TAX_DISPLAY', 0, NOW(), NOW()),
577591
(
578-
'PS_SMARTY_FORCE_COMPILE', 1, NOW(),
592+
'PS_SMARTY_FORCE_COMPILE',
593+
1,
594+
NOW(),
579595
NOW()
580596
),
581597
(
582-
'PS_DISTANCE_UNIT', 'km', NOW(), NOW()
598+
'PS_DISTANCE_UNIT',
599+
'km',
600+
NOW(),
601+
NOW()
583602
),
584603
(
585-
'PS_STORES_DISPLAY_CMS', 0, NOW(),
604+
'PS_STORES_DISPLAY_CMS',
605+
0,
606+
NOW(),
586607
NOW()
587608
),
588609
(
589-
'PS_STORES_DISPLAY_FOOTER', 0, NOW(),
610+
'PS_STORES_DISPLAY_FOOTER',
611+
0,
612+
NOW(),
590613
NOW()
591614
),
592615
(
593-
'PS_STORES_SIMPLIFIED', 0, NOW(),
616+
'PS_STORES_SIMPLIFIED',
617+
0,
618+
NOW(),
594619
NOW()
595620
),
596621
(
597622
'PS_STATSDATA_CUSTOMER_PAGESVIEWS',
598-
1, NOW(), NOW()
623+
1,
624+
NOW(),
625+
NOW()
599626
),
600627
(
601-
'PS_STATSDATA_PAGESVIEWS', 1, NOW(),
628+
'PS_STATSDATA_PAGESVIEWS',
629+
1,
630+
NOW(),
602631
NOW()
603632
),
604633
(
605-
'PS_STATSDATA_PLUGINS', 1, NOW(),
634+
'PS_STATSDATA_PLUGINS',
635+
1,
636+
NOW(),
606637
NOW()
607638
)
608639
---

0 commit comments

Comments
 (0)