From d92248c4ef8cb9cbd9fb4f23a76ac3128b17b55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Lu=CC=88ckers?= Date: Tue, 17 May 2022 09:24:51 +0200 Subject: [PATCH 1/2] Remove deprecated fields from modResource --- core/model/schema/modx.mysql.schema.xml | 5 +--- core/src/Revolution/modResource.php | 3 -- core/src/Revolution/mysql/modResource.php | 30 ------------------- core/src/Revolution/mysql/modTemplateVar.php | 2 +- ....0.2-remove-deprecated-resource-fields.php | 24 +++++++++++++++ setup/includes/upgrades/mysql/3.0.2-pl.php | 11 +++++++ 6 files changed, 37 insertions(+), 38 deletions(-) create mode 100644 setup/includes/upgrades/common/3.0.2-remove-deprecated-resource-fields.php create mode 100644 setup/includes/upgrades/mysql/3.0.2-pl.php diff --git a/core/model/schema/modx.mysql.schema.xml b/core/model/schema/modx.mysql.schema.xml index aa7ef1032bf..05c4afbb3a0 100644 --- a/core/model/schema/modx.mysql.schema.xml +++ b/core/model/schema/modx.mysql.schema.xml @@ -848,9 +848,6 @@ - - - @@ -1146,7 +1143,7 @@ - + diff --git a/core/src/Revolution/modResource.php b/core/src/Revolution/modResource.php index 4b41b0c9e8f..4343ee6a369 100644 --- a/core/src/Revolution/modResource.php +++ b/core/src/Revolution/modResource.php @@ -46,9 +46,6 @@ * @property int $publishedon The UNIX time that this Resource was marked as published * @property int $publishedby The User that published this Resource * @property string $menutitle The title to show when this Resource is displayed in a menu - * @property boolean $donthit Deprecated. - * @property boolean $privateweb Deprecated. - * @property boolean $privatemgr Deprecated. * @property int $content_dispo The type of Content Disposition that is used when displaying this Resource * @property boolean $hidemenu Whether or not this Resource should show in menus * @property string $class_key The Class Key of this Resource. Useful for derivative Resource types diff --git a/core/src/Revolution/mysql/modResource.php b/core/src/Revolution/mysql/modResource.php index 8a1eb2c9924..8034f26f060 100644 --- a/core/src/Revolution/mysql/modResource.php +++ b/core/src/Revolution/mysql/modResource.php @@ -46,9 +46,6 @@ class modResource extends \MODX\Revolution\modResource 'publishedon' => 0, 'publishedby' => 0, 'menutitle' => '', - 'donthit' => 0, - 'privateweb' => 0, - 'privatemgr' => 0, 'content_dispo' => 0, 'hidemenu' => 0, 'class_key' => 'MODX\\Revolution\\modDocument', @@ -307,33 +304,6 @@ class modResource extends \MODX\Revolution\modResource 'null' => false, 'default' => '', ), - 'donthit' => - array ( - 'dbtype' => 'tinyint', - 'precision' => '1', - 'attributes' => 'unsigned', - 'phptype' => 'boolean', - 'null' => false, - 'default' => 0, - ), - 'privateweb' => - array ( - 'dbtype' => 'tinyint', - 'precision' => '1', - 'attributes' => 'unsigned', - 'phptype' => 'boolean', - 'null' => false, - 'default' => 0, - ), - 'privatemgr' => - array ( - 'dbtype' => 'tinyint', - 'precision' => '1', - 'attributes' => 'unsigned', - 'phptype' => 'boolean', - 'null' => false, - 'default' => 0, - ), 'content_dispo' => array ( 'dbtype' => 'tinyint', diff --git a/core/src/Revolution/mysql/modTemplateVar.php b/core/src/Revolution/mysql/modTemplateVar.php index 4f521ea9429..189680974af 100644 --- a/core/src/Revolution/mysql/modTemplateVar.php +++ b/core/src/Revolution/mysql/modTemplateVar.php @@ -315,7 +315,7 @@ class modTemplateVar extends \MODX\Revolution\modTemplateVar 'reserved' => array ( 'type' => 'preg_match', - 'rule' => '/^(?!(id|type|pagetitle|longtitle|description|alias|alias_visible|link_attributes|published|pub_date|unpub_date|parent|isfolder|introtext|content|richtext|template|menuindex|searchable|cacheable|createdby|createdon|editedby|editedon|deleted|deletedby|deletedon|publishedon|publishedby|menutitle|donthit|privateweb|privatemgr|content_dispo|hidemenu|class_key|context_key|content_type|uri|uri_override|hide_children_in_tree|show_in_tree|properties)$)/', + 'rule' => '/^(?!(id|type|pagetitle|longtitle|description|alias|alias_visible|link_attributes|published|pub_date|unpub_date|parent|isfolder|introtext|content|richtext|template|menuindex|searchable|cacheable|createdby|createdon|editedby|editedon|deleted|deletedby|deletedon|publishedon|publishedby|menutitle|content_dispo|hidemenu|class_key|context_key|content_type|uri|uri_override|hide_children_in_tree|show_in_tree|properties)$)/', 'message' => 'tv_err_reserved_name', ), ), diff --git a/setup/includes/upgrades/common/3.0.2-remove-deprecated-resource-fields.php b/setup/includes/upgrades/common/3.0.2-remove-deprecated-resource-fields.php new file mode 100644 index 00000000000..108808730ff --- /dev/null +++ b/setup/includes/upgrades/common/3.0.2-remove-deprecated-resource-fields.php @@ -0,0 +1,24 @@ +getTableName($class); + +$deprecatedFields = [ + 'privateweb', + 'privatemgr', + 'donthit', +]; + +foreach ($deprecatedFields as $deprecatedField) { + $description = $this->install->lexicon('drop_column', ['column' => $deprecatedField, 'table' => $table]); + $this->processResults($class, $description, [$modx->manager, 'removeField'], [$class, $deprecatedField]); +} diff --git a/setup/includes/upgrades/mysql/3.0.2-pl.php b/setup/includes/upgrades/mysql/3.0.2-pl.php new file mode 100644 index 00000000000..db298b4587d --- /dev/null +++ b/setup/includes/upgrades/mysql/3.0.2-pl.php @@ -0,0 +1,11 @@ + Date: Tue, 31 Jan 2023 12:43:07 +0100 Subject: [PATCH 2/2] Drop all the deprecated columns in a single statement --- ....0.2-remove-deprecated-resource-fields.php | 24 ------------------- ....1.0-remove-deprecated-resource-fields.php | 18 ++++++++++++++ .../mysql/{3.0.2-pl.php => 3.1.0-pl.php} | 4 ++-- 3 files changed, 20 insertions(+), 26 deletions(-) delete mode 100644 setup/includes/upgrades/common/3.0.2-remove-deprecated-resource-fields.php create mode 100644 setup/includes/upgrades/common/3.1.0-remove-deprecated-resource-fields.php rename setup/includes/upgrades/mysql/{3.0.2-pl.php => 3.1.0-pl.php} (56%) diff --git a/setup/includes/upgrades/common/3.0.2-remove-deprecated-resource-fields.php b/setup/includes/upgrades/common/3.0.2-remove-deprecated-resource-fields.php deleted file mode 100644 index 108808730ff..00000000000 --- a/setup/includes/upgrades/common/3.0.2-remove-deprecated-resource-fields.php +++ /dev/null @@ -1,24 +0,0 @@ -getTableName($class); - -$deprecatedFields = [ - 'privateweb', - 'privatemgr', - 'donthit', -]; - -foreach ($deprecatedFields as $deprecatedField) { - $description = $this->install->lexicon('drop_column', ['column' => $deprecatedField, 'table' => $table]); - $this->processResults($class, $description, [$modx->manager, 'removeField'], [$class, $deprecatedField]); -} diff --git a/setup/includes/upgrades/common/3.1.0-remove-deprecated-resource-fields.php b/setup/includes/upgrades/common/3.1.0-remove-deprecated-resource-fields.php new file mode 100644 index 00000000000..eb9f75e760a --- /dev/null +++ b/setup/includes/upgrades/common/3.1.0-remove-deprecated-resource-fields.php @@ -0,0 +1,18 @@ +getTableName($class); +$sql = "ALTER TABLE {$modx->escape($table)} + DROP COLUMN `privateweb`, + DROP COLUMN `privatemgr`, + DROP COLUMN `donthit`;"; +$modx->exec($sql); diff --git a/setup/includes/upgrades/mysql/3.0.2-pl.php b/setup/includes/upgrades/mysql/3.1.0-pl.php similarity index 56% rename from setup/includes/upgrades/mysql/3.0.2-pl.php rename to setup/includes/upgrades/mysql/3.1.0-pl.php index db298b4587d..53c6864107d 100644 --- a/setup/includes/upgrades/mysql/3.0.2-pl.php +++ b/setup/includes/upgrades/mysql/3.1.0-pl.php @@ -1,6 +1,6 @@