From f4c8d0df8fe193a3f984cbf0ca2b4ee520c7b5fd Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 2 Dec 2018 21:49:35 -0600 Subject: [PATCH] Cleanup: remove action_property and action_parameter where not used --- common/database/classes/database_alter_domain.php | 13 +++++-------- .../classes/database_alter_event_trigger.php | 13 +++++-------- .../classes/database_alter_foreign_data_wrapper.php | 20 +++++++------------- .../classes/database_alter_foreign_table.php | 6 ------ 4 files changed, 17 insertions(+), 35 deletions(-) diff --git a/common/database/classes/database_alter_domain.php b/common/database/classes/database_alter_domain.php index 395399e..3e5cfb3 100644 --- a/common/database/classes/database_alter_domain.php +++ b/common/database/classes/database_alter_domain.php @@ -32,7 +32,6 @@ class c_database_alter_coalation extends c_database_query { use t_database_rename_to; use t_database_set_schema; use t_database_action; - use t_database_action_property; protected const pr_QUERY_COMMAND = 'alter domain'; @@ -45,12 +44,11 @@ class c_database_alter_coalation extends c_database_query { public function __construct() { parent::__construct(); ; - $this->action = NULL; - $this->action_property = NULL; - $this->name = NULL; - $this->owner_to = NULL; - $this->rename_to = NULL; - $this->set_schema = NULL + $this->action = NULL; + $this->name = NULL; + $this->owner_to = NULL; + $this->rename_to = NULL; + $this->set_schema = NULL $this->expression = NULL; $this->constraint = NULL; @@ -61,7 +59,6 @@ class c_database_alter_coalation extends c_database_query { */ public function __destruct() { unset($this->action); - unset($this->action_property); unset($this->name); unset($this->owner_to); unset($this->rename_to); diff --git a/common/database/classes/database_alter_event_trigger.php b/common/database/classes/database_alter_event_trigger.php index 307c434..1cd5bcf 100644 --- a/common/database/classes/database_alter_event_trigger.php +++ b/common/database/classes/database_alter_event_trigger.php @@ -25,7 +25,6 @@ require_once('common/database/traits/database_rename_to.php'); class c_database_alter_coalation extends c_database_query { use t_database_action; use t_database_action_property; - use t_database_action_parameter; use t_database_name; use t_database_owner_to; use t_database_rename_to; @@ -39,12 +38,11 @@ class c_database_alter_coalation extends c_database_query { public function __construct() { parent::__construct(); - $this->action = NULL; - $this->action_property = NULL; - $this->action_parameter = NULL; - $this->name = NULL; - $this->owner_to = NULL; - $this->rename_to = NULL; + $this->action = NULL; + $this->action_property = NULL; + $this->name = NULL; + $this->owner_to = NULL; + $this->rename_to = NULL; } /** @@ -53,7 +51,6 @@ class c_database_alter_coalation extends c_database_query { public function __destruct() { unset($this->action); unset($this->action_property); - unset($this->action_parameter); unset($this->name); unset($this->owner_to); unset($this->rename_to); diff --git a/common/database/classes/database_alter_foreign_data_wrapper.php b/common/database/classes/database_alter_foreign_data_wrapper.php index 19a5f3d..6470e30 100644 --- a/common/database/classes/database_alter_foreign_data_wrapper.php +++ b/common/database/classes/database_alter_foreign_data_wrapper.php @@ -25,8 +25,6 @@ require_once('common/database/traits/database_validator.php'); */ class c_database_alter_foreign_data_wrapper extends c_database_query { use t_database_action; - use t_database_action_property; - use t_database_action_parameter; use t_database_handler; use t_database_name; use t_database_options; @@ -43,15 +41,13 @@ class c_database_alter_foreign_data_wrapper extends c_database_query { public function __construct() { parent::__construct(); - $this->action = NULL; - $this->action_property = NULL; - $this->action_parameter = NULL; - $this->handler = NULL; - $this->name = NULL; - $this->options = NULL; - $this->owner_to = NULL; - $this->rename_to = NULL; - $this->validator = NULL; + $this->action = NULL; + $this->handler = NULL; + $this->name = NULL; + $this->options = NULL; + $this->owner_to = NULL; + $this->rename_to = NULL; + $this->validator = NULL; } /** @@ -59,8 +55,6 @@ class c_database_alter_foreign_data_wrapper extends c_database_query { */ public function __destruct() { unset($this->action); - unset($this->action_property); - unset($this->action_parameter); unset($this->handler); unset($this->name); unset($this->options); diff --git a/common/database/classes/database_alter_foreign_table.php b/common/database/classes/database_alter_foreign_table.php index 7b726ed..64854ff 100644 --- a/common/database/classes/database_alter_foreign_table.php +++ b/common/database/classes/database_alter_foreign_table.php @@ -23,8 +23,6 @@ require_once('common/database/traits/database_rename_to.php'); class c_database_alter_foreign_table extends c_database_query { protected const pr_QUERY_COMMAND = 'alter foreign table'; use t_database_action; - use t_database_action_property; - use t_database_action_parameter; use t_database_name; use t_database_rename_column_to; use t_database_rename_to; @@ -63,8 +61,6 @@ class c_database_alter_foreign_table extends c_database_query { parent::__construct(); $this->action = NULL; - $this->action_property = NULL; - $this->action_parameter = NULL; $this->name = NULL; $this->rename_column_to = NULL; $this->rename_to = NULL; @@ -81,8 +77,6 @@ class c_database_alter_foreign_table extends c_database_query { parent::__destruct(); unset($this->action); - unset($this->action_property); - unset($this->action_parameter); unset($this->name); unset($this->rename_column_to); unset($this->rename_to); -- 1.8.3.1