Installer and upgrader rewrite

.gitignore

@@ -5,6 +5,7 @@
 !/Languages/en_US/
 /Languages/en_US/agreement.txt
 Settings.php
+!Sources/Db/Schema/*/Settings.php
 Settings_bak.php
 Settings_org.php
 db_last_error.php

Sources/Cookie.php

@@ -402,7 +402,10 @@ public static function setLoginCookie(int $cookie_length, int $id, string $passw
 			// Backup and remove the old session.
 			$oldSessionData = $_SESSION;
 			$_SESSION = [];
-			session_destroy();
+
+			if (session_status() === PHP_SESSION_ACTIVE) {
+				session_destroy();
+			}
 
 			// Recreate and restore the new session.
 			Session::load();

Sources/Db/APIs/MySQL.php

@@ -1521,7 +1521,7 @@ public function create_table(string $table_name, array $columns, array $indexes
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// First - no way do we touch SMF tables.
-		if (in_array(strtolower($short_table_name), $this->reservedTables)) {
+		if (!defined('SMF_INSTALLING') && in_array(strtolower($short_table_name), $this->reservedTables)) {
 			return false;
 		}
 
@@ -1692,7 +1692,7 @@ public function drop_table(string $table_name, array $parameters = [], string $e
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// God no - dropping one of these = bad.
-		if (in_array(strtolower($short_table_name), $this->reservedTables)) {
+		if (!defined('SMF_INSTALLING') && in_array(strtolower($short_table_name), $this->reservedTables)) {
 			return false;
 		}
 
@@ -2378,7 +2378,7 @@ protected function create_query_column(array $column): string
 
 		// Sort out the size... and stuff...
 		$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
-		list($type, $size) = $this->calculate_type($column['type'], (int) $column['size']);
+		list($type, $size) = $this->calculate_type($column['type'], $column['size'] === null ? null : (int) $column['size']);
 
 		// Allow unsigned integers (mysql only)
 		$unsigned = in_array($type, ['int', 'tinyint', 'smallint', 'mediumint', 'bigint']) && !empty($column['unsigned']) ? 'unsigned ' : '';

Sources/Db/APIs/PostgreSQL.php

@@ -1619,7 +1619,7 @@ public function create_table(string $table_name, array $columns, array $indexes
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// First - no way do we touch SMF tables.
-		if (in_array(strtolower($short_table_name), $this->reservedTables)) {
+		if (!defined('SMF_INSTALLING') && in_array(strtolower($short_table_name), $this->reservedTables)) {
 			return false;
 		}
 
@@ -1811,7 +1811,7 @@ public function drop_table(string $table_name, array $parameters = [], string $e
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// God no - dropping one of these = bad.
-		if (in_array(strtolower($table_name), $this->reservedTables)) {
+		if (!defined('SMF_INSTALLING') && in_array(strtolower($table_name), $this->reservedTables)) {
 			return false;
 		}
 

Sources/Db/DatabaseApi.php

@@ -438,6 +438,12 @@ protected function __construct()
 	 */
 	protected function prefixReservedTables(): void
 	{
+		if (defined('SMF_INSTALLING')) {
+			$this->reservedTables = [];
+
+			return;
+		}
+
 		// Reset $reservedTables to default.
 		$class_vars = get_class_vars(__CLASS__);
 		$this->reservedTables = $class_vars['reservedTables'];

Sources/Db/Schema/Column.php

@@ -0,0 +1,202 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2023 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 1
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Db\Schema;
+
+use SMF\Db\DatabaseApi as Db;
+
+/**
+ * Represents a column in a database table.
+ */
+class Column
+{
+	/*******************
+	 * Public properties
+	 *******************/
+
+	/**
+	 * @var string
+	 *
+	 * Name of the column.
+	 */
+	public string $name;
+
+	/**
+	 * @var string
+	 *
+	 * Data type of the column.
+	 */
+	public string $type;
+
+	/**
+	 * @var ?int
+	 *
+	 * Size of the column.
+	 * Only applicable to some data types.
+	 */
+	public ?int $size;
+
+	/**
+	 * @var ?bool
+	 *
+	 * Whether the column uses unsigned numerical values.
+	 * Only applicable in MySQL.
+	 */
+	public ?bool $unsigned;
+
+	/**
+	 * @var ?bool
+	 *
+	 * Whether the column disallows null values.
+	 */
+	public ?bool $not_null;
+
+	/**
+	 * @var string|float|int|bool|null
+	 *
+	 * Default value of the column.
+	 */
+	public string|float|int|bool|null $default;
+
+	/**
+	 * @var ?bool
+	 *
+	 * Whether this is an automatically incrementing column.
+	 * Only applicable to integer columns.
+	 */
+	public ?bool $auto;
+
+	/**
+	 * @var ?string
+	 *
+	 * The character set for string data.
+	 * Only applicable to string types.
+	 */
+	public ?string $charset;
+
+	/**
+	 * @var bool
+	 *
+	 * Set this to true to drop the default during an ALTER TABLE operation.
+	 *
+	 * This is not set by __construct(). It can be set afterward.
+	 */
+	public bool $drop_default = false;
+
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name Name of the column.
+	 * @param string $type Data type of the column.
+	 * @param ?int $size Size of the column.
+	 *    Only applicable to some data types.
+	 * @param ?bool $unsigned Whether the column uses unsigned numerical values.
+	 *    Only used by MySQL.
+	 * @param ?bool $not_null Whether the column disallows null values.
+	 * @param mixed $default Default value of the column. If null, no default
+	 *    will be set. To set an explicit null default, use the string 'NULL'.
+	 * @param ?bool $auto Whether this is an automatically incrementing column.
+	 *    Only applicable to integer columns.
+	 * @param ?string $charset The character set for string data.
+	 *    Only applicable to string types. If null, will be set automatically.
+	 */
+	public function __construct(
+		string $name,
+		string $type,
+		?int $size = null,
+		?bool $unsigned = null,
+		?bool $not_null = null,
+		string|float|int|bool|null $default = null,
+		?bool $auto = null,
+		?string $charset = null,
+	) {
+		$this->name = strtolower($name);
+		$this->type = strtolower($type);
+
+		if (isset($default)) {
+			$this->default = $default === 'NULL' ? null : $default;
+		}
+
+		foreach (['auto', 'size', 'unsigned', 'not_null'] as $var) {
+			if (isset($var)) {
+				$this->{$var} = ${$var};
+			}
+		}
+
+		if (isset($charset)) {
+			$this->charset = strtolower($charset);
+		}
+	}
+
+	/**
+	 * Adds this column to the specified table.
+	 *
+	 * @see SMF\Db\DatabaseApi::add_column
+	 *
+	 * @param string $table_name The name of the table to add the column to.
+	 * @param string $if_exists What to do if the column exists.
+	 *    If 'update', column is updated.
+	 * @return bool Whether or not the operation was successful.
+	 */
+	public function add(string $table_name, string $if_exists = 'update'): bool
+	{
+		return Db::$db->add_column(
+			$table_name,
+			get_object_vars($this),
+			[],
+			$if_exists,
+		);
+	}
+
+	/**
+	 * Updates the column in the database to match the definition given by this
+	 * object's properties.
+	 *
+	 * @see SMF\Db\DatabaseApi::change_column
+	 *
+	 * @param string $table_name Name of the table that contains this column.
+	 * @return bool Whether or not the operation was successful.
+	 */
+	public function alter(string $table_name): bool
+	{
+		return Db::$db->change_column(
+			$table_name,
+			$this->name,
+			get_object_vars($this),
+		);
+	}
+
+	/**
+	 * Drops this column from the specified table.
+	 *
+	 * @see SMF\Db\DatabaseApi::remove_column
+	 *
+	 * @param string $table_name The name of the table to drop the column from.
+	 * @return bool Whether or not the operation was successful.
+	 */
+	public function drop(string $table_name): bool
+	{
+		return Db::$db->remove_column(
+			$table_name,
+			$this->name,
+		);
+	}
+}
+
+?>