Fix up errors during connection on installer

SimpleMachines · Nov 22, 2023 · e242dc3 · e242dc3
1 parent cff5f4f
commit e242dc3
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/Sources/Db/APIs/MySQL.php b/Sources/Db/APIs/MySQL.php
@@ -2020,23 +2020,27 @@ protected function __construct(array $options = [])
 			$this->prefixReservedTables();
 		}
 
-		$this->get_version();
-		$this->supports_pcre = version_compare($this->version, strpos($this->version, 'MariaDB') !== false ? '10.0.5' : '8.0.4', '>=');
+		if (empty($this->connection) && !$non_fatal)
+		{
+			$this->get_version();
+			$this->supports_pcre = version_compare($this->version, strpos($this->version, 'MariaDB') !== false ? '10.0.5' : '8.0.4', '>=');
+		}
 
 		// For backward compatibility.
 		if (!is_object(self::$db_connection)) {
 			self::$db_connection = $this->connection;
 		}
 
 		// Ensure database has UTF-8 as its default input charset.
-		$this->query(
-			'',
-			'
-			SET NAMES {string:db_character_set}',
-			[
-				'db_character_set' => $this->character_set,
-			],
-		);
+		if (empty($this->connection) && !$non_fatal)
+			$this->query(
+				'',
+				'
+				SET NAMES {string:db_character_set}',
+				[
+					'db_character_set' => $this->character_set,
+				],
+			);
 	}
 
 	/**