From e20618cd2f3dd9ecc4d4232e4e60366977b0f959 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 26 Jul 2026 18:15:06 +0200 Subject: [PATCH 1/2] Add INET4 and INET6 data types Signed-off-by: Liviu-Mihail Concioiu --- src/Contexts/ContextMariaDb100500.php | 1 + src/Contexts/ContextMariaDb100600.php | 1 + src/Contexts/ContextMariaDb100700.php | 1 + src/Contexts/ContextMariaDb100800.php | 1 + src/Contexts/ContextMariaDb100900.php | 1 + src/Contexts/ContextMariaDb101000.php | 2 ++ src/Contexts/ContextMariaDb101100.php | 2 ++ src/Contexts/ContextMariaDb110000.php | 2 ++ src/Contexts/ContextMariaDb110100.php | 2 ++ src/Contexts/ContextMariaDb110200.php | 2 ++ src/Contexts/ContextMariaDb110300.php | 2 ++ src/Contexts/ContextMariaDb110400.php | 2 ++ src/Contexts/ContextMariaDb110500.php | 2 ++ src/Contexts/ContextMariaDb110600.php | 2 ++ src/Contexts/ContextMariaDb110700.php | 2 ++ src/Contexts/ContextMariaDb110800.php | 2 ++ src/Contexts/ContextMariaDb120000.php | 2 ++ src/Contexts/ContextMariaDb120100.php | 2 ++ tools/contexts/MariaDb100500.txt | 1 + tools/contexts/MariaDb100600.txt | 1 + tools/contexts/MariaDb100700.txt | 1 + tools/contexts/MariaDb100800.txt | 1 + tools/contexts/MariaDb100900.txt | 1 + tools/contexts/MariaDb101000.txt | 2 ++ tools/contexts/MariaDb101100.txt | 2 ++ tools/contexts/MariaDb110000.txt | 2 ++ tools/contexts/MariaDb110100.txt | 2 ++ tools/contexts/MariaDb110200.txt | 2 ++ tools/contexts/MariaDb110300.txt | 2 ++ tools/contexts/MariaDb110400.txt | 2 ++ tools/contexts/MariaDb110500.txt | 2 ++ tools/contexts/MariaDb110600.txt | 2 ++ tools/contexts/MariaDb110700.txt | 2 ++ tools/contexts/MariaDb110800.txt | 2 ++ tools/contexts/MariaDb120000.txt | 2 ++ tools/contexts/MariaDb120100.txt | 2 ++ 36 files changed, 62 insertions(+) diff --git a/src/Contexts/ContextMariaDb100500.php b/src/Contexts/ContextMariaDb100500.php index 3c471f496..a01d472d5 100644 --- a/src/Contexts/ContextMariaDb100500.php +++ b/src/Contexts/ContextMariaDb100500.php @@ -617,6 +617,7 @@ class ContextMariaDb100500 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb100600.php b/src/Contexts/ContextMariaDb100600.php index d1525200d..bcc85b76a 100644 --- a/src/Contexts/ContextMariaDb100600.php +++ b/src/Contexts/ContextMariaDb100600.php @@ -617,6 +617,7 @@ class ContextMariaDb100600 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb100700.php b/src/Contexts/ContextMariaDb100700.php index 2b2840b41..5065b7b94 100644 --- a/src/Contexts/ContextMariaDb100700.php +++ b/src/Contexts/ContextMariaDb100700.php @@ -617,6 +617,7 @@ class ContextMariaDb100700 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb100800.php b/src/Contexts/ContextMariaDb100800.php index 538a9a857..dbe81e4ed 100644 --- a/src/Contexts/ContextMariaDb100800.php +++ b/src/Contexts/ContextMariaDb100800.php @@ -617,6 +617,7 @@ class ContextMariaDb100800 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb100900.php b/src/Contexts/ContextMariaDb100900.php index 3b72fc34f..58d8efecb 100644 --- a/src/Contexts/ContextMariaDb100900.php +++ b/src/Contexts/ContextMariaDb100900.php @@ -617,6 +617,7 @@ class ContextMariaDb100900 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb101000.php b/src/Contexts/ContextMariaDb101000.php index f600d24d5..be40d50d1 100644 --- a/src/Contexts/ContextMariaDb101000.php +++ b/src/Contexts/ContextMariaDb101000.php @@ -617,6 +617,8 @@ class ContextMariaDb101000 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb101100.php b/src/Contexts/ContextMariaDb101100.php index 35f43fa8a..d157a1fca 100644 --- a/src/Contexts/ContextMariaDb101100.php +++ b/src/Contexts/ContextMariaDb101100.php @@ -617,6 +617,8 @@ class ContextMariaDb101100 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb110000.php b/src/Contexts/ContextMariaDb110000.php index 7d937bedd..578c1f8be 100644 --- a/src/Contexts/ContextMariaDb110000.php +++ b/src/Contexts/ContextMariaDb110000.php @@ -617,6 +617,8 @@ class ContextMariaDb110000 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb110100.php b/src/Contexts/ContextMariaDb110100.php index a3971d011..00bcee520 100644 --- a/src/Contexts/ContextMariaDb110100.php +++ b/src/Contexts/ContextMariaDb110100.php @@ -617,6 +617,8 @@ class ContextMariaDb110100 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb110200.php b/src/Contexts/ContextMariaDb110200.php index de24e201f..0fccc4a7e 100644 --- a/src/Contexts/ContextMariaDb110200.php +++ b/src/Contexts/ContextMariaDb110200.php @@ -617,6 +617,8 @@ class ContextMariaDb110200 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb110300.php b/src/Contexts/ContextMariaDb110300.php index 2597c5eaf..0d4e2ff1b 100644 --- a/src/Contexts/ContextMariaDb110300.php +++ b/src/Contexts/ContextMariaDb110300.php @@ -617,6 +617,8 @@ class ContextMariaDb110300 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb110400.php b/src/Contexts/ContextMariaDb110400.php index 2580ff9d8..eb29f7e1e 100644 --- a/src/Contexts/ContextMariaDb110400.php +++ b/src/Contexts/ContextMariaDb110400.php @@ -617,6 +617,8 @@ class ContextMariaDb110400 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb110500.php b/src/Contexts/ContextMariaDb110500.php index 26e741980..10182d1d2 100644 --- a/src/Contexts/ContextMariaDb110500.php +++ b/src/Contexts/ContextMariaDb110500.php @@ -615,6 +615,8 @@ class ContextMariaDb110500 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb110600.php b/src/Contexts/ContextMariaDb110600.php index 979bfb2a0..c8eb95637 100644 --- a/src/Contexts/ContextMariaDb110600.php +++ b/src/Contexts/ContextMariaDb110600.php @@ -615,6 +615,8 @@ class ContextMariaDb110600 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb110700.php b/src/Contexts/ContextMariaDb110700.php index 0372389a8..f8196d727 100644 --- a/src/Contexts/ContextMariaDb110700.php +++ b/src/Contexts/ContextMariaDb110700.php @@ -615,6 +615,8 @@ class ContextMariaDb110700 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb110800.php b/src/Contexts/ContextMariaDb110800.php index 614a15051..48f9b0599 100644 --- a/src/Contexts/ContextMariaDb110800.php +++ b/src/Contexts/ContextMariaDb110800.php @@ -615,6 +615,8 @@ class ContextMariaDb110800 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb120000.php b/src/Contexts/ContextMariaDb120000.php index d9aca8913..883ec3673 100644 --- a/src/Contexts/ContextMariaDb120000.php +++ b/src/Contexts/ContextMariaDb120000.php @@ -615,6 +615,8 @@ class ContextMariaDb120000 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/src/Contexts/ContextMariaDb120100.php b/src/Contexts/ContextMariaDb120100.php index 614f73e08..3aae2e6c1 100644 --- a/src/Contexts/ContextMariaDb120100.php +++ b/src/Contexts/ContextMariaDb120100.php @@ -615,6 +615,8 @@ class ContextMariaDb120100 extends Context 'ENUM' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'FIXED' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'GEOMETRY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET4' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, + 'INET6' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'JSON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOINT' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, 'MULTILINEPOLYGON' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_DATA_TYPE, diff --git a/tools/contexts/MariaDb100500.txt b/tools/contexts/MariaDb100500.txt index 02e421548..09df14a18 100644 --- a/tools/contexts/MariaDb100500.txt +++ b/tools/contexts/MariaDb100500.txt @@ -220,6 +220,7 @@ IMPORT IN (R) INDEX (R) INDEXES +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb100600.txt b/tools/contexts/MariaDb100600.txt index b72b0a0c8..f1147af01 100644 --- a/tools/contexts/MariaDb100600.txt +++ b/tools/contexts/MariaDb100600.txt @@ -220,6 +220,7 @@ IMPORT IN (R) INDEX (R) INDEXES +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb100700.txt b/tools/contexts/MariaDb100700.txt index 5e0346e4c..3bf1201c0 100644 --- a/tools/contexts/MariaDb100700.txt +++ b/tools/contexts/MariaDb100700.txt @@ -220,6 +220,7 @@ IMPORT IN (R) INDEX (R) INDEXES +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb100800.txt b/tools/contexts/MariaDb100800.txt index 5e0346e4c..3bf1201c0 100644 --- a/tools/contexts/MariaDb100800.txt +++ b/tools/contexts/MariaDb100800.txt @@ -220,6 +220,7 @@ IMPORT IN (R) INDEX (R) INDEXES +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb100900.txt b/tools/contexts/MariaDb100900.txt index 5e0346e4c..3bf1201c0 100644 --- a/tools/contexts/MariaDb100900.txt +++ b/tools/contexts/MariaDb100900.txt @@ -220,6 +220,7 @@ IMPORT IN (R) INDEX (R) INDEXES +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb101000.txt b/tools/contexts/MariaDb101000.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb101000.txt +++ b/tools/contexts/MariaDb101000.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb101100.txt b/tools/contexts/MariaDb101100.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb101100.txt +++ b/tools/contexts/MariaDb101100.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb110000.txt b/tools/contexts/MariaDb110000.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb110000.txt +++ b/tools/contexts/MariaDb110000.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb110100.txt b/tools/contexts/MariaDb110100.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb110100.txt +++ b/tools/contexts/MariaDb110100.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb110200.txt b/tools/contexts/MariaDb110200.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb110200.txt +++ b/tools/contexts/MariaDb110200.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb110300.txt b/tools/contexts/MariaDb110300.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb110300.txt +++ b/tools/contexts/MariaDb110300.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb110400.txt b/tools/contexts/MariaDb110400.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb110400.txt +++ b/tools/contexts/MariaDb110400.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb110500.txt b/tools/contexts/MariaDb110500.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb110500.txt +++ b/tools/contexts/MariaDb110500.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb110600.txt b/tools/contexts/MariaDb110600.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb110600.txt +++ b/tools/contexts/MariaDb110600.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb110700.txt b/tools/contexts/MariaDb110700.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb110700.txt +++ b/tools/contexts/MariaDb110700.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb110800.txt b/tools/contexts/MariaDb110800.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb110800.txt +++ b/tools/contexts/MariaDb110800.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb120000.txt b/tools/contexts/MariaDb120000.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb120000.txt +++ b/tools/contexts/MariaDb120000.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) diff --git a/tools/contexts/MariaDb120100.txt b/tools/contexts/MariaDb120100.txt index 5e0346e4c..ca56259ee 100644 --- a/tools/contexts/MariaDb120100.txt +++ b/tools/contexts/MariaDb120100.txt @@ -220,6 +220,8 @@ IMPORT IN (R) INDEX (R) INDEXES +INET4 (D) +INET6 (D) INFILE (R) INITIAL_SIZE INNER (R) From b9f74c12c7d8578105a38044e1a35f05a6038111 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 26 Jul 2026 18:19:02 +0200 Subject: [PATCH 2/2] Add tests Signed-off-by: Liviu-Mihail Concioiu --- tests/Parser/CreateStatementTest.php | 2 + .../parseCreateTable19_mariadb_100500.in | 1 + .../parseCreateTable19_mariadb_100500.out | 220 ++++++++++++++++++ .../parseCreateTable20_mariadb_101000.in | 1 + .../parseCreateTable20_mariadb_101000.out | 220 ++++++++++++++++++ 5 files changed, 444 insertions(+) create mode 100644 tests/data/parser/parseCreateTable19_mariadb_100500.in create mode 100644 tests/data/parser/parseCreateTable19_mariadb_100500.out create mode 100644 tests/data/parser/parseCreateTable20_mariadb_101000.in create mode 100644 tests/data/parser/parseCreateTable20_mariadb_101000.out diff --git a/tests/Parser/CreateStatementTest.php b/tests/Parser/CreateStatementTest.php index c6f1e5a31..7504d520e 100644 --- a/tests/Parser/CreateStatementTest.php +++ b/tests/Parser/CreateStatementTest.php @@ -53,6 +53,8 @@ public static function createProvider(): array ['parser/parseCreateTable16'], ['parser/parseCreateTable17'], ['parser/parseCreateTable18'], + ['parser/parseCreateTable19_mariadb_100500'], + ['parser/parseCreateTable20_mariadb_101000'], ['parser/parseCreateTableErr1'], ['parser/parseCreateTableErr2'], ['parser/parseCreateTableErr3'], diff --git a/tests/data/parser/parseCreateTable19_mariadb_100500.in b/tests/data/parser/parseCreateTable19_mariadb_100500.in new file mode 100644 index 000000000..acd675869 --- /dev/null +++ b/tests/data/parser/parseCreateTable19_mariadb_100500.in @@ -0,0 +1 @@ +CREATE TABLE `test` (`ip` INET6); diff --git a/tests/data/parser/parseCreateTable19_mariadb_100500.out b/tests/data/parser/parseCreateTable19_mariadb_100500.out new file mode 100644 index 000000000..804cee8f4 --- /dev/null +++ b/tests/data/parser/parseCreateTable19_mariadb_100500.out @@ -0,0 +1,220 @@ +{ + "query": "CREATE TABLE `test` (`ip` INET6);\n", + "lexer": { + "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "str": "CREATE TABLE `test` (`ip` INET6);\n", + "len": 34, + "last": 34, + "list": { + "@type": "PhpMyAdmin\\SqlParser\\TokensList", + "tokens": [ + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "CREATE", + "value": "CREATE", + "keyword": "CREATE", + "type": 1, + "flags": 3, + "position": 0 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": " ", + "value": " ", + "keyword": null, + "type": 3, + "flags": 0, + "position": 6 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "TABLE", + "value": "TABLE", + "keyword": "TABLE", + "type": 1, + "flags": 3, + "position": 7 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": " ", + "value": " ", + "keyword": null, + "type": 3, + "flags": 0, + "position": 12 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "`test`", + "value": "test", + "keyword": null, + "type": 8, + "flags": 2, + "position": 13 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": " ", + "value": " ", + "keyword": null, + "type": 3, + "flags": 0, + "position": 19 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "(", + "value": "(", + "keyword": null, + "type": 2, + "flags": 16, + "position": 20 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "`ip`", + "value": "ip", + "keyword": null, + "type": 8, + "flags": 2, + "position": 21 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": " ", + "value": " ", + "keyword": null, + "type": 3, + "flags": 0, + "position": 25 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "INET6", + "value": "INET6", + "keyword": "INET6", + "type": 1, + "flags": 9, + "position": 26 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": ")", + "value": ")", + "keyword": null, + "type": 2, + "flags": 16, + "position": 31 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": ";", + "value": ";", + "keyword": null, + "type": 9, + "flags": 0, + "position": 32 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "\n", + "value": " ", + "keyword": null, + "type": 3, + "flags": 0, + "position": 33 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": null, + "value": null, + "keyword": null, + "type": 9, + "flags": 0, + "position": null + } + ], + "count": 14, + "idx": 14 + }, + "delimiter": ";", + "delimiterLen": 1, + "strict": false, + "errors": [] + }, + "parser": { + "@type": "PhpMyAdmin\\SqlParser\\Parser", + "list": { + "@type": "@1" + }, + "statements": [ + { + "@type": "PhpMyAdmin\\SqlParser\\Statements\\CreateStatement", + "name": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\Expression", + "database": null, + "table": "test", + "column": null, + "expr": "`test`", + "alias": null, + "function": null, + "subquery": null + }, + "entityOptions": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", + "options": [] + }, + "fields": [ + { + "@type": "PhpMyAdmin\\SqlParser\\Components\\CreateDefinition", + "name": "ip", + "isConstraint": null, + "type": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\DataType", + "name": "INET6", + "parameters": [], + "options": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", + "options": [] + } + }, + "key": null, + "references": null, + "options": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", + "options": [] + } + } + ], + "with": null, + "select": null, + "like": null, + "partitionBy": null, + "partitionsNum": null, + "subpartitionBy": null, + "subpartitionsNum": null, + "partitions": null, + "table": null, + "return": null, + "parameters": null, + "body": [], + "options": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", + "options": { + "6": "TABLE" + } + }, + "first": 0, + "last": 11 + } + ], + "brackets": 0, + "strict": false, + "errors": [] + }, + "errors": { + "lexer": [], + "parser": [] + } +} \ No newline at end of file diff --git a/tests/data/parser/parseCreateTable20_mariadb_101000.in b/tests/data/parser/parseCreateTable20_mariadb_101000.in new file mode 100644 index 000000000..3c6e2398c --- /dev/null +++ b/tests/data/parser/parseCreateTable20_mariadb_101000.in @@ -0,0 +1 @@ +CREATE TABLE `test` (`ip` INET4); diff --git a/tests/data/parser/parseCreateTable20_mariadb_101000.out b/tests/data/parser/parseCreateTable20_mariadb_101000.out new file mode 100644 index 000000000..bc8673f71 --- /dev/null +++ b/tests/data/parser/parseCreateTable20_mariadb_101000.out @@ -0,0 +1,220 @@ +{ + "query": "CREATE TABLE `test` (`ip` INET4);\n", + "lexer": { + "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "str": "CREATE TABLE `test` (`ip` INET4);\n", + "len": 34, + "last": 34, + "list": { + "@type": "PhpMyAdmin\\SqlParser\\TokensList", + "tokens": [ + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "CREATE", + "value": "CREATE", + "keyword": "CREATE", + "type": 1, + "flags": 3, + "position": 0 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": " ", + "value": " ", + "keyword": null, + "type": 3, + "flags": 0, + "position": 6 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "TABLE", + "value": "TABLE", + "keyword": "TABLE", + "type": 1, + "flags": 3, + "position": 7 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": " ", + "value": " ", + "keyword": null, + "type": 3, + "flags": 0, + "position": 12 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "`test`", + "value": "test", + "keyword": null, + "type": 8, + "flags": 2, + "position": 13 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": " ", + "value": " ", + "keyword": null, + "type": 3, + "flags": 0, + "position": 19 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "(", + "value": "(", + "keyword": null, + "type": 2, + "flags": 16, + "position": 20 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "`ip`", + "value": "ip", + "keyword": null, + "type": 8, + "flags": 2, + "position": 21 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": " ", + "value": " ", + "keyword": null, + "type": 3, + "flags": 0, + "position": 25 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "INET4", + "value": "INET4", + "keyword": "INET4", + "type": 1, + "flags": 9, + "position": 26 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": ")", + "value": ")", + "keyword": null, + "type": 2, + "flags": 16, + "position": 31 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": ";", + "value": ";", + "keyword": null, + "type": 9, + "flags": 0, + "position": 32 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": "\n", + "value": " ", + "keyword": null, + "type": 3, + "flags": 0, + "position": 33 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Token", + "token": null, + "value": null, + "keyword": null, + "type": 9, + "flags": 0, + "position": null + } + ], + "count": 14, + "idx": 14 + }, + "delimiter": ";", + "delimiterLen": 1, + "strict": false, + "errors": [] + }, + "parser": { + "@type": "PhpMyAdmin\\SqlParser\\Parser", + "list": { + "@type": "@1" + }, + "statements": [ + { + "@type": "PhpMyAdmin\\SqlParser\\Statements\\CreateStatement", + "name": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\Expression", + "database": null, + "table": "test", + "column": null, + "expr": "`test`", + "alias": null, + "function": null, + "subquery": null + }, + "entityOptions": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", + "options": [] + }, + "fields": [ + { + "@type": "PhpMyAdmin\\SqlParser\\Components\\CreateDefinition", + "name": "ip", + "isConstraint": null, + "type": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\DataType", + "name": "INET4", + "parameters": [], + "options": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", + "options": [] + } + }, + "key": null, + "references": null, + "options": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", + "options": [] + } + } + ], + "with": null, + "select": null, + "like": null, + "partitionBy": null, + "partitionsNum": null, + "subpartitionBy": null, + "subpartitionsNum": null, + "partitions": null, + "table": null, + "return": null, + "parameters": null, + "body": [], + "options": { + "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", + "options": { + "6": "TABLE" + } + }, + "first": 0, + "last": 11 + } + ], + "brackets": 0, + "strict": false, + "errors": [] + }, + "errors": { + "lexer": [], + "parser": [] + } +} \ No newline at end of file