"NOW()" is like any other function like "XYZ()"

doctrine · May 13, 2024 · 63e22c4 · 63e22c4
1 parent d1ac84a
commit 63e22c4
Show file tree

Hide file tree

Showing 5 changed files with 156 additions and 63 deletions.
diff --git a/src/Tokenizer.php b/src/Tokenizer.php
@@ -184,7 +184,6 @@ final class Tokenizer
         'NATURAL',
         'NO OTHERS',
         'NOT',
-        'NOW()',
         'NULL',
         'OFFSET',
         'ON',
@@ -563,6 +562,7 @@ final class Tokenizer
         'MULTIPOLYGONFROMTEXT',
         'MULTIPOLYGONFROMWKB',
         'NAME_CONST',
+        'NOW',
         'NTH_VALUE',
         'NTILE',
         'NULLIF',

diff --git a/tests/clihighlight.html b/tests/clihighlight.html
@@ -465,7 +465,15 @@
 ---
 [37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_cms_category`[0m
 [37mVALUES[0m
-  ([32;1m1[0m,[0m [32;1m0[0m,[0m [32;1m0[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m,[0m [32;1m0[0m)
+  (
+    [32;1m1[0m,[0m
+    [32;1m0[0m,[0m
+    [32;1m0[0m,[0m
+    [32;1m1[0m,[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m(),[0m
+    [32;1m0[0m
+  )
 ---
 [37mUPDATE[0m
   [35;1m`PREFIX_cms_category`[0m
@@ -571,39 +579,62 @@
   (
     [34;1m'PS_SPECIFIC_PRICE_PRIORITIES'[0m,[0m
     [34;1m'id_shop;id_currency;id_country;id_group'[0m,[0m
-    [37mNOW()[0m,[0m [37mNOW()[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
+  ),[0m
+  (
+    [34;1m'PS_TAX_DISPLAY'[0m,[0m
+    [32;1m0[0m,[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
   ),[0m
-  ([34;1m'PS_TAX_DISPLAY'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m),[0m
   (
-    [34;1m'PS_SMARTY_FORCE_COMPILE'[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m
-    [37mNOW()[0m
+    [34;1m'PS_SMARTY_FORCE_COMPILE'[0m,[0m
+    [32;1m1[0m,[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
   ),[0m
   (
-    [34;1m'PS_DISTANCE_UNIT'[0m,[0m [34;1m'km'[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m
+    [34;1m'PS_DISTANCE_UNIT'[0m,[0m
+    [34;1m'km'[0m,[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
   ),[0m
   (
-    [34;1m'PS_STORES_DISPLAY_CMS'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m
-    [37mNOW()[0m
+    [34;1m'PS_STORES_DISPLAY_CMS'[0m,[0m
+    [32;1m0[0m,[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
   ),[0m
   (
-    [34;1m'PS_STORES_DISPLAY_FOOTER'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m
-    [37mNOW()[0m
+    [34;1m'PS_STORES_DISPLAY_FOOTER'[0m,[0m
+    [32;1m0[0m,[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
   ),[0m
   (
-    [34;1m'PS_STORES_SIMPLIFIED'[0m,[0m [32;1m0[0m,[0m [37mNOW()[0m,[0m
-    [37mNOW()[0m
+    [34;1m'PS_STORES_SIMPLIFIED'[0m,[0m
+    [32;1m0[0m,[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
   ),[0m
   (
     [34;1m'PS_STATSDATA_CUSTOMER_PAGESVIEWS'[0m,[0m
-    [32;1m1[0m,[0m [37mNOW()[0m,[0m [37mNOW()[0m
+    [32;1m1[0m,[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
   ),[0m
   (
-    [34;1m'PS_STATSDATA_PAGESVIEWS'[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m
-    [37mNOW()[0m
+    [34;1m'PS_STATSDATA_PAGESVIEWS'[0m,[0m
+    [32;1m1[0m,[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
   ),[0m
   (
-    [34;1m'PS_STATSDATA_PLUGINS'[0m,[0m [32;1m1[0m,[0m [37mNOW()[0m,[0m
-    [37mNOW()[0m
+    [34;1m'PS_STATSDATA_PLUGINS'[0m,[0m
+    [32;1m1[0m,[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
   )
 ---
 [37mINSERT[0m [37mINTO[0m [35;1m`PREFIX_configuration`[0m (
@@ -623,8 +654,8 @@
       ),[0m
       [32;1m0[0m
     ),[0m
-    [37mNOW()[0m,[0m
-    [37mNOW()[0m
+    [37mNOW[0m(),[0m
+    [37mNOW[0m()
   )
 ---
 [37mCREATE[0m [37mTEMPORARY[0m [37mTABLE[0m [35;1m`PREFIX_configuration_tmp`[0m ([35;1m`value`[0m text[0m)

diff --git a/tests/format-highlight.html b/tests/format-highlight.html
@@ -465,7 +465,15 @@
 ---
 <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>
 <span style="font-weight:bold;">VALUES</span>
-  (<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>
+  (
+    <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>
 ---
 <pre style="color: black; background-color: white;"><span style="font-weight:bold;">UPDATE</span>
   <span style="color: purple;">`PREFIX_cms_category`</span>
@@ -571,39 +579,62 @@
   (
     <span style="color: blue;">'PS_SPECIFIC_PRICE_PRIORITIES'</span><span >,</span>
     <span style="color: blue;">'id_shop;id_currency;id_country;id_group'</span><span >,</span>
-    <span style="font-weight:bold;">NOW()</span><span >,</span> <span style="font-weight:bold;">NOW()</span>
+    <span style="font-weight:bold;">NOW</span>()<span >,</span>
+    <span style="font-weight:bold;">NOW</span>()
+  )<span >,</span>
+  (
+    <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>
-  (<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>
   (
-    <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>
-    <span style="font-weight:bold;">NOW()</span>
+    <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>
+    <span style="font-weight:bold;">NOW</span>()
   )<span >,</span>
   (
-    <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>
+    <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>()
   )<span >,</span>
   (
-    <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>
-    <span style="font-weight:bold;">NOW()</span>
+    <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>
+    <span style="font-weight:bold;">NOW</span>()
   )<span >,</span>
   (
-    <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>
-    <span style="font-weight:bold;">NOW()</span>
+    <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>
+    <span style="font-weight:bold;">NOW</span>()
   )<span >,</span>
   (
-    <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>
-    <span style="font-weight:bold;">NOW()</span>
+    <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>
+    <span style="font-weight:bold;">NOW</span>()
   )<span >,</span>
   (
     <span style="color: blue;">'PS_STATSDATA_CUSTOMER_PAGESVIEWS'</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 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: blue;">'PS_STATSDATA_PAGESVIEWS'</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 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>
+    <span style="font-weight:bold;">NOW</span>()
   )<span >,</span>
   (
-    <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>
-    <span style="font-weight:bold;">NOW()</span>
+    <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>
+    <span style="font-weight:bold;">NOW</span>()
   )</pre>
 ---
 <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 @@
       )<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 style="font-weight:bold;">NOW</span>()<span >,</span>
+    <span style="font-weight:bold;">NOW</span>()
   )</pre>
 ---
 <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>

diff --git a/tests/format.html b/tests/format.html
@@ -465,7 +465,15 @@
 ---
 INSERT INTO `PREFIX_cms_category`
 VALUES
-  (1, 0, 0, 1, NOW(), NOW(), 0)
+  (
+    1,
+    0,
+    0,
+    1,
+    NOW(),
+    NOW(),
+    0
+  )
 ---
 UPDATE
   `PREFIX_cms_category`
@@ -571,38 +579,61 @@
   (
     'PS_SPECIFIC_PRICE_PRIORITIES',
     'id_shop;id_currency;id_country;id_group',
-    NOW(), NOW()
+    NOW(),
+    NOW()
+  ),
+  (
+    'PS_TAX_DISPLAY',
+    0,
+    NOW(),
+    NOW()
   ),
-  ('PS_TAX_DISPLAY', 0, NOW(), NOW()),
   (
-    'PS_SMARTY_FORCE_COMPILE', 1, NOW(),
+    'PS_SMARTY_FORCE_COMPILE',
+    1,
+    NOW(),
     NOW()
   ),
   (
-    'PS_DISTANCE_UNIT', 'km', NOW(), NOW()
+    'PS_DISTANCE_UNIT',
+    'km',
+    NOW(),
+    NOW()
   ),
   (
-    'PS_STORES_DISPLAY_CMS', 0, NOW(),
+    'PS_STORES_DISPLAY_CMS',
+    0,
+    NOW(),
     NOW()
   ),
   (
-    'PS_STORES_DISPLAY_FOOTER', 0, NOW(),
+    'PS_STORES_DISPLAY_FOOTER',
+    0,
+    NOW(),
     NOW()
   ),
   (
-    'PS_STORES_SIMPLIFIED', 0, NOW(),
+    'PS_STORES_SIMPLIFIED',
+    0,
+    NOW(),
     NOW()
   ),
   (
     'PS_STATSDATA_CUSTOMER_PAGESVIEWS',
-    1, NOW(), NOW()
+    1,
+    NOW(),
+    NOW()
   ),
   (
-    'PS_STATSDATA_PAGESVIEWS', 1, NOW(),
+    'PS_STATSDATA_PAGESVIEWS',
+    1,
+    NOW(),
     NOW()
   ),
   (
-    'PS_STATSDATA_PLUGINS', 1, NOW(),
+    'PS_STATSDATA_PLUGINS',
+    1,
+    NOW(),
     NOW()
   )
 ---