Merge pull request 'fix(installer): drop legacy remote columns in PHP, not PREPARE-based SQL' (#218) from fix/sql-prepared-statement-protocol into dev
This commit was merged in pull request #218.
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
# FILE INFORMATION
|
||||
# DEFGROUP: MokoGitea.Workflow
|
||||
# INGROUP: mokocli.Automation
|
||||
# VERSION: 02.57.00
|
||||
# VERSION: 02.57.01
|
||||
# BRIEF: Auto-create feature branch when an issue is opened
|
||||
|
||||
name: "Universal: Issue Branch"
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
### Fixed
|
||||
- Installer no longer aborts on MySQL 8 with "This command is not supported in the prepared statement protocol yet" (error 1295). The legacy remote-column purge migration (`02.56.01.sql`) used `PREPARE`/`EXECUTE`/`DEALLOCATE`, which Joomla's installer rejects; the drop now runs in the package installer script via an INFORMATION_SCHEMA-gated plain `ALTER` (portable across MariaDB and MySQL 8). (#213 update path)
|
||||
|
||||
## [02.57.00] --- 2026-07-05
|
||||
|
||||
### Added
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
|
||||
INGROUP: Template-Joomla.Documentation
|
||||
REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
|
||||
PATH: /SECURITY.md
|
||||
VERSION: 02.57.00
|
||||
VERSION: 02.57.01
|
||||
BRIEF: Security vulnerability reporting and handling policy
|
||||
-->
|
||||
|
||||
|
||||
Submodule source/packages/MokoSuiteClient updated: 2273690f94...9419d19fbc
@@ -17,7 +17,7 @@
|
||||
display label there.
|
||||
-->
|
||||
<name>MokoSuiteBackup</name>
|
||||
<version>02.57.00</version>
|
||||
<version>02.57.01</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -1,32 +1,13 @@
|
||||
-- Purge legacy single-remote storage columns from installs where they are still present.
|
||||
-- Legacy single-remote storage columns are now purged by the package installer
|
||||
-- script (Pkg_MokoSuiteBackupInstallerScript::dropLegacyRemoteColumns()), NOT here.
|
||||
--
|
||||
-- Background: 02.52.25.sql originally used `DROP COLUMN IF EXISTS`, which is a
|
||||
-- MariaDB-only extension and errors on Oracle MySQL 8.x. On MySQL 8 installs the
|
||||
-- migration failed but Joomla still recorded the schema as applied, leaving all 26
|
||||
-- legacy remote_storage/ftp_*/sftp_*/gdrive_*/s3_* columns stranded on the profiles
|
||||
-- table. This migration removes them portably.
|
||||
-- The 26 legacy remote_storage/ftp_*/sftp_*/gdrive_*/s3_* columns must be removed
|
||||
-- portably across MariaDB and MySQL 8. `DROP COLUMN IF EXISTS` is MariaDB-only
|
||||
-- (errors on MySQL 8); plain `DROP COLUMN` errors when a column is absent. The
|
||||
-- previous version gated the ALTER on INFORMATION_SCHEMA and ran it via
|
||||
-- PREPARE/EXECUTE/DEALLOCATE — but those statements are rejected by Joomla's
|
||||
-- installer SQL path (MySQL error 1295: "This command is not supported in the
|
||||
-- prepared statement protocol yet"), which ABORTED the whole component install.
|
||||
--
|
||||
-- It must be safe on BOTH engines AND on installs where the columns are already gone
|
||||
-- (MariaDB, or anyone who ran the corrected 02.52.25). Plain `DROP COLUMN` errors when
|
||||
-- a column is absent, and `DROP COLUMN IF EXISTS` errors on MySQL 8 — so neither works
|
||||
-- unconditionally. We gate the drop on INFORMATION_SCHEMA and build the ALTER via a
|
||||
-- prepared statement, which runs on MySQL 8 and MariaDB alike. All 26 columns were
|
||||
-- created and dropped together, so the presence of `remote_storage` gates the whole set.
|
||||
-- When the columns are absent this is a no-op (`DO 0`).
|
||||
|
||||
SET @moko_has_legacy_remote := (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = '#__mokosuitebackup_profiles'
|
||||
AND COLUMN_NAME = 'remote_storage'
|
||||
);
|
||||
|
||||
SET @moko_drop_legacy_remote := IF(@moko_has_legacy_remote > 0,
|
||||
'ALTER TABLE `#__mokosuitebackup_profiles` DROP COLUMN `remote_storage`, DROP COLUMN `ftp_host`, DROP COLUMN `ftp_port`, DROP COLUMN `ftp_username`, DROP COLUMN `ftp_password`, DROP COLUMN `ftp_path`, DROP COLUMN `ftp_passive`, DROP COLUMN `ftp_ssl`, DROP COLUMN `sftp_host`, DROP COLUMN `sftp_port`, DROP COLUMN `sftp_username`, DROP COLUMN `sftp_auth_type`, DROP COLUMN `sftp_password`, DROP COLUMN `sftp_key_data`, DROP COLUMN `sftp_passphrase`, DROP COLUMN `sftp_path`, DROP COLUMN `gdrive_client_id`, DROP COLUMN `gdrive_client_secret`, DROP COLUMN `gdrive_refresh_token`, DROP COLUMN `gdrive_folder_id`, DROP COLUMN `s3_endpoint`, DROP COLUMN `s3_region`, DROP COLUMN `s3_access_key`, DROP COLUMN `s3_secret_key`, DROP COLUMN `s3_bucket`, DROP COLUMN `s3_path`',
|
||||
'DO 0'
|
||||
);
|
||||
|
||||
PREPARE moko_stmt FROM @moko_drop_legacy_remote;
|
||||
EXECUTE moko_stmt;
|
||||
DEALLOCATE PREPARE moko_stmt;
|
||||
-- The drop is now done in PHP (INFORMATION_SCHEMA gate + a plain ALTER for only the
|
||||
-- columns that still exist), so this migration is intentionally a no-op.
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/* 02.57.01 — no schema changes */
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="module" client="administrator" method="upgrade">
|
||||
<name>Module - MokoSuiteBackup - cPanel</name>
|
||||
<version>02.57.00</version>
|
||||
<version>02.57.01</version>
|
||||
<creationDate>2026-06-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="actionlog" method="upgrade">
|
||||
<name>Action Log - MokoSuiteBackup</name>
|
||||
<version>02.57.00</version>
|
||||
<version>02.57.01</version>
|
||||
<creationDate>2026-06-04</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="console" method="upgrade">
|
||||
<name>Console - MokoSuiteBackup</name>
|
||||
<version>02.57.00</version>
|
||||
<version>02.57.01</version>
|
||||
<creationDate>2026-06-04</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="content" method="upgrade">
|
||||
<name>Content - MokoSuiteBackup</name>
|
||||
<version>02.57.00</version>
|
||||
<version>02.57.01</version>
|
||||
<creationDate>2026-06-04</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<extension type="plugin" group="quickicon" method="upgrade">
|
||||
<name>Quick Icon - MokoSuiteBackup</name>
|
||||
<version>02.57.00</version>
|
||||
<version>02.57.01</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="system" method="upgrade">
|
||||
<name>System - MokoSuiteBackup</name>
|
||||
<version>02.57.00</version>
|
||||
<version>02.57.01</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="task" method="upgrade">
|
||||
<name>Task - MokoSuiteBackup</name>
|
||||
<version>02.57.00</version>
|
||||
<version>02.57.01</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="webservices" method="upgrade">
|
||||
<name>Web Services - MokoSuiteBackup</name>
|
||||
<version>02.57.00</version>
|
||||
<version>02.57.01</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<extension type="package" method="upgrade">
|
||||
<name>Package - MokoSuiteBackup</name>
|
||||
<packagename>mokosuitebackup</packagename>
|
||||
<version>02.57.00</version>
|
||||
<version>02.57.01</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -177,6 +177,10 @@ class Pkg_MokoSuiteBackupInstallerScript
|
||||
briefly used the "Type - Name" convention. Self-healing on every update. */
|
||||
$this->removeOrphanedComponent();
|
||||
|
||||
/* Drop legacy single-remote storage columns portably (replaces the old
|
||||
PREPARE/EXECUTE migration that MySQL 8 rejected in Joomla's installer). */
|
||||
$this->dropLegacyRemoteColumns();
|
||||
|
||||
/* Install completion notice (install and update) */
|
||||
$this->installSuccessful();
|
||||
|
||||
@@ -273,6 +277,54 @@ class Pkg_MokoSuiteBackupInstallerScript
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Drop the 26 legacy single-remote storage columns from the profiles table if
|
||||
* they are still present. Replaces sql/updates/mysql/02.56.01.sql, whose
|
||||
* PREPARE/EXECUTE/DEALLOCATE approach is rejected by Joomla's installer on
|
||||
* MySQL 8 (error 1295) and aborted the whole install. Done here in PHP: gate on
|
||||
* INFORMATION_SCHEMA, then issue a plain ALTER for only the columns that exist —
|
||||
* portable across MariaDB and MySQL 8. Idempotent and non-fatal.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
private function dropLegacyRemoteColumns(): void
|
||||
{
|
||||
try {
|
||||
$db = Factory::getDbo();
|
||||
$table = $db->getPrefix() . 'mokosuitebackup_profiles';
|
||||
|
||||
$columns = [
|
||||
'remote_storage',
|
||||
'ftp_host', 'ftp_port', 'ftp_username', 'ftp_password', 'ftp_path', 'ftp_passive', 'ftp_ssl',
|
||||
'sftp_host', 'sftp_port', 'sftp_username', 'sftp_auth_type', 'sftp_password', 'sftp_key_data', 'sftp_passphrase', 'sftp_path',
|
||||
'gdrive_client_id', 'gdrive_client_secret', 'gdrive_refresh_token', 'gdrive_folder_id',
|
||||
's3_endpoint', 's3_region', 's3_access_key', 's3_secret_key', 's3_bucket', 's3_path',
|
||||
];
|
||||
|
||||
// Which legacy columns still exist on this install?
|
||||
$db->setQuery(
|
||||
$db->getQuery(true)
|
||||
->select($db->quoteName('COLUMN_NAME'))
|
||||
->from($db->quoteName('INFORMATION_SCHEMA.COLUMNS'))
|
||||
->where($db->quoteName('TABLE_SCHEMA') . ' = DATABASE()')
|
||||
->where($db->quoteName('TABLE_NAME') . ' = ' . $db->quote($table))
|
||||
->where($db->quoteName('COLUMN_NAME') . ' IN (' . implode(',', array_map([$db, 'quote'], $columns)) . ')')
|
||||
);
|
||||
$present = $db->loadColumn();
|
||||
|
||||
if (empty($present)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$drops = array_map(fn($c) => 'DROP COLUMN ' . $db->quoteName($c), $present);
|
||||
$db->setQuery('ALTER TABLE ' . $db->quoteName($table) . ' ' . implode(', ', $drops));
|
||||
$db->execute();
|
||||
} catch (\Throwable $e) {
|
||||
/* Best-effort — a leftover column is harmless and must never abort the install */
|
||||
Log::add('MokoSuiteBackup legacy-remote-column drop failed: ' . $e->getMessage(), Log::WARNING, 'jerror');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Recursively delete a directory (version-independent, no Folder dependency).
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user