Merge pull request #16304 from Nibbler999/inet6

Add support for INET6 column type
phpmyadmin · Aug 15, 2020 · 5931d5a · 5931d5a
2 parents 18d9bff + 1aaa4a6
commit 5931d5a
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php
@@ -391,6 +391,11 @@ public function getTypeDescription($type)
                     'Stores and enables efficient access to data in JSON'
                     . ' (JavaScript Object Notation) documents'
                 );
+            case 'INET6':
+                return __('Intended for storage of IPv6 addresses, as well as IPv4 '
+                    . 'addresses assuming conventional mapping of IPv4 addresses '
+                    . 'into IPv6 addresses'
+                );
         }
 
         return '';
@@ -441,6 +446,7 @@ public function getTypeClass($type)
             case 'LONGBLOB':
             case 'ENUM':
             case 'SET':
+            case 'INET6':
                 return 'CHAR';
             case 'GEOMETRY':
             case 'POINT':
@@ -778,6 +784,10 @@ public function getColumns(): array
             $ret['JSON'] = ['JSON'];
         }
 
+        if ($isMariaDB && $serverVersion >= 100500) {
+            array_push($ret[_pgettext('string types', 'String')], '-', 'INET6');
+        }
+
         return $ret;
     }