From 1aaa4a6f8720006616c476013b06b4e474cc9fc4 Mon Sep 17 00:00:00 2001 From: Tom Atkinson Date: Sat, 15 Aug 2020 12:32:32 +0200 Subject: [PATCH] Add support for INET6 column type Signed-off-by: Tom Atkinson --- libraries/classes/Types.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php index 40b5bce5ee..1e38c19e16 100644 --- a/libraries/classes/Types.php +++ b/libraries/classes/Types.php @@ -391,6 +391,11 @@ class Types '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 @@ class Types case 'LONGBLOB': case 'ENUM': case 'SET': + case 'INET6': return 'CHAR'; case 'GEOMETRY': case 'POINT': @@ -778,6 +784,10 @@ class Types $ret['JSON'] = ['JSON']; } + if ($isMariaDB && $serverVersion >= 100500) { + array_push($ret[_pgettext('string types', 'String')], '-', 'INET6'); + } + return $ret; }