Merge pull request #8936 from jdarwood007/3.0/mysqlNTOA

[3.0] Implement MySQL native INET6_ATON

Author: jdarwood007

Sources/Db/APIs/MySQL.php

@@ -766,13 +766,11 @@ public function error_insert(array $error_array): void
 				$this->connection,
 				'INSERT INTO ' . $this->prefix . 'log_errors
 					(id_member, log_time, ip, url, message, session, error_type, file, line, backtrace)
-				VALUES( ?, ?, unhex(?), ?, ?, ?, ?, ?, ?, ?)',
+				VALUES( ?, ?, INET6_ATON(?), ?, ?, ?, ?, ?, ?, ?)',
 			);
 		}
 
-		if (filter_var($error_array['ip'], FILTER_VALIDATE_IP) !== false) {
-			$error_array['ip'] = bin2hex(inet_pton($error_array['ip']));
-		} else {
+		if (filter_var($error_array['ip'], FILTER_VALIDATE_IP) === false) {
 			$error_array['ip'] = null;
 		}
 
@@ -2808,8 +2806,7 @@ protected function replacement__callback(array $matches, array $db_values, objec
 					$this->error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 				}
 
-				// We don't use the native support of mysql > 5.6.2
-				return \sprintf('unhex(\'%1$s\')', $ip->toHex());
+				return \sprintf('INET6_ATON(\'%1$s\')', $ip);
 
 			case 'array_inet':
 				if (\is_array($replacement)) {
@@ -2828,7 +2825,7 @@ protected function replacement__callback(array $matches, array $db_values, objec
 							$this->error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 						}
 
-						$replacement[$key] = \sprintf('unhex(\'%1$s\')', $ip->toHex());
+						$replacement[$key] = \sprintf('INET6_ATON(\'%1$s\')', $ip);
 					}
 
 					return implode(', ', $replacement);

Sources/Maintenance/Migration/v2_1/Ipv6BanItem.php

@@ -85,6 +85,9 @@ public function execute(): bool
 					WHERE ip_low1 > 0',
 				);
 			} else {
+				// Note, We now support MySQL 8+, which means we could use INET6_ATON.
+				// The upgrade logic was built this way and should remain the same.
+				// If changed, a full upgrade from 2.0 to 3.0 would need to be tested.
 				$this->quote(
 					'UPDATE IGNORE {db_prefix}ban_items
 					SET ip_low =