From 982981f90f909bb40983e632292dec4c0cb465a7 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 18 Aug 2018 13:58:24 -0500 Subject: [PATCH] Progress: continue development of database abstraction I am having a lot of indecision on how exactly to approach key parts of this. I have added query parameter class, and may be replacing the existing implementation (or not). I decided to keep the naming system more simple by remove the query_ prefix of methods and variables provided by the database traits. This may introduce naming conflicts that need to be reviewed and resolved. --- .../database/classes/database_alter_aggregate.php | 32 ++--- .../database/classes/database_alter_coalation.php | 32 ++--- .../database/classes/database_alter_conversion.php | 32 ++--- .../database/classes/database_alter_database.php | 90 ++++++------ .../classes/database_alter_default_privileges.php | 34 ++--- common/database/classes/database_alter_domain.php | 56 ++++---- .../classes/database_alter_event_trigger.php | 5 +- .../database/classes/database_alter_extension.php | 1 - .../database_alter_foreign_data_wrapper.php | 1 - .../classes/database_alter_foreign_table.php | 1 - .../database/classes/database_alter_function.php | 1 - common/database/classes/database_alter_group.php | 1 - common/database/classes/database_alter_index.php | 1 - .../database/classes/database_alter_language.php | 1 - .../classes/database_alter_large_object.php | 1 - .../classes/database_alter_materialized_view.php | 1 - .../database/classes/database_alter_operator.php | 1 - .../classes/database_alter_operator_class.php | 1 - .../classes/database_alter_operator_family.php | 1 - common/database/classes/database_alter_policy.php | 1 - .../classes/database_alter_publication.php | 1 - common/database/classes/database_alter_role.php | 1 - common/database/classes/database_alter_rule.php | 1 - common/database/classes/database_alter_schema.php | 1 - common/database/classes/database_alter_table.php | 1 - .../database/classes/database_alter_tablespace.php | 1 - .../database_alter_text_search_configuration.php | 1 - .../database_alter_text_search_dictionary.php | 1 - .../classes/database_alter_text_search_parser.php | 1 - .../database_alter_text_search_template.php | 1 - common/database/classes/database_alter_trigger.php | 1 - common/database/classes/database_alter_type.php | 1 - common/database/classes/database_alter_user.php | 1 - .../classes/database_alter_user_mapping.php | 1 - common/database/classes/database_alter_view.php | 1 - common/database/classes/database_analyze.php | 1 - common/database/classes/database_begin.php | 1 - common/database/classes/database_checkpoint.php | 1 - common/database/classes/database_close.php | 1 - common/database/classes/database_cluster.php | 1 - common/database/classes/database_comment.php | 1 - common/database/classes/database_commit.php | 1 - .../database/classes/database_commit_prepared.php | 1 - common/database/classes/database_copy.php | 1 - .../classes/database_create_access_method.php | 1 - .../database/classes/database_create_aggregate.php | 1 - common/database/classes/database_create_cast.php | 1 - .../database/classes/database_create_collation.php | 1 - .../classes/database_create_conversion.php | 1 - .../database/classes/database_create_database.php | 1 - common/database/classes/database_create_domain.php | 1 - .../classes/database_create_event_trigger.php | 1 - .../database/classes/database_create_extension.php | 1 - .../database/classes/database_create_foreign.php | 1 - .../database_create_foreign_data_wrapper.php | 1 - .../database/classes/database_create_function.php | 1 - common/database/classes/database_create_group.php | 1 - common/database/classes/database_create_index.php | 1 - .../database/classes/database_create_language.php | 1 - .../classes/database_create_materialized_view.php | 1 - .../database/classes/database_create_operator.php | 1 - .../classes/database_create_operator_class.php | 1 - .../classes/database_create_operator_family.php | 1 - common/database/classes/database_create_policy.php | 1 - .../classes/database_create_publication.php | 1 - common/database/classes/database_create_role.php | 1 - common/database/classes/database_create_rule.php | 1 - common/database/classes/database_create_schema.php | 1 - .../database/classes/database_create_sequence.php | 1 - common/database/classes/database_create_server.php | 1 - .../classes/database_create_statistics.php | 1 - .../classes/database_create_subscription.php | 1 - common/database/classes/database_create_table.php | 1 - .../database/classes/database_create_table_as.php | 1 - .../classes/database_create_tablespace.php | 1 - .../database_create_text_search_configuration.php | 1 - .../database_create_text_search_dictionary.php | 1 - .../classes/database_create_text_search_parser.php | 1 - .../database_create_text_search_template.php | 1 - .../database/classes/database_create_transform.php | 1 - .../database/classes/database_create_trigger.php | 1 - common/database/classes/database_create_type.php | 1 - common/database/classes/database_create_user.php | 1 - .../classes/database_create_user_mapping.php | 1 - common/database/classes/database_create_view.php | 1 - common/database/classes/database_deallocate.php | 1 - common/database/classes/database_declare.php | 1 - common/database/classes/database_delete.php | 1 - common/database/classes/database_discard.php | 1 - common/database/classes/database_do.php | 1 - .../classes/database_drop_access_method.php | 1 - .../database/classes/database_drop_aggregate.php | 1 - common/database/classes/database_drop_cast.php | 1 - .../database/classes/database_drop_collation.php | 1 - .../database/classes/database_drop_conversion.php | 1 - common/database/classes/database_drop_database.php | 1 - common/database/classes/database_drop_domain.php | 1 - .../classes/database_drop_event_trigger.php | 1 - .../database/classes/database_drop_extension.php | 1 - .../classes/database_drop_foreign_data_wrapper.php | 1 - .../classes/database_drop_foreign_table.php | 1 - common/database/classes/database_drop_function.php | 1 - common/database/classes/database_drop_group.php | 1 - common/database/classes/database_drop_index.php | 1 - common/database/classes/database_drop_language.php | 1 - .../classes/database_drop_materialized_view.php | 1 - common/database/classes/database_drop_operator.php | 1 - .../classes/database_drop_operator_class.php | 1 - .../classes/database_drop_operator_family.php | 1 - common/database/classes/database_drop_owned.php | 1 - common/database/classes/database_drop_policy.php | 1 - .../database/classes/database_drop_publication.php | 1 - common/database/classes/database_drop_role.php | 1 - common/database/classes/database_drop_rule.php | 1 - common/database/classes/database_drop_schema.php | 1 - common/database/classes/database_drop_sequence.php | 1 - common/database/classes/database_drop_server.php | 1 - .../database/classes/database_drop_statistics.php | 1 - .../classes/database_drop_subscription.php | 1 - common/database/classes/database_drop_table.php | 1 - .../database/classes/database_drop_tablespace.php | 1 - .../database_drop_text_search_configuration.php | 1 - .../database_drop_text_search_dictionary.php | 1 - .../classes/database_drop_text_search_parser.php | 1 - .../classes/database_drop_text_search_template.php | 1 - .../database/classes/database_drop_transform.php | 1 - common/database/classes/database_drop_trigger.php | 1 - common/database/classes/database_drop_type.php | 1 - common/database/classes/database_drop_user.php | 1 - .../classes/database_drop_user_mapping.php | 1 - common/database/classes/database_drop_view.php | 1 - common/database/classes/database_end.php | 1 - common/database/classes/database_execute.php | 1 - common/database/classes/database_explain.php | 1 - common/database/classes/database_fetch.php | 1 - common/database/classes/database_grant.php | 1 - .../classes/database_import_foreign_schema.php | 1 - common/database/classes/database_insert.php | 1 - common/database/classes/database_listen.php | 1 - common/database/classes/database_load.php | 1 - common/database/classes/database_lock.php | 1 - common/database/classes/database_move.php | 1 - common/database/classes/database_notify.php | 1 - common/database/classes/database_prepare.php | 1 - .../classes/database_prepare_transaction.php | 1 - common/database/classes/database_query.php | 19 +-- .../database/classes/database_query_parameter.php | 154 ++++++++++++++------- .../database/classes/database_reassign_owned.php | 1 - .../classes/database_refresh_materialized.php | 1 - common/database/classes/database_reindex.php | 1 - .../classes/database_release_savepoint.php | 1 - common/database/classes/database_reset.php | 1 - common/database/classes/database_revoke.php | 1 - common/database/classes/database_rollback.php | 1 - .../classes/database_rollback_prepared.php | 1 - .../classes/database_rollback_to_savepoint.php | 1 - common/database/classes/database_savepoint.php | 1 - .../database/classes/database_security_label.php | 1 - common/database/classes/database_select.php | 1 - common/database/classes/database_select_into.php | 1 - common/database/classes/database_set.php | 1 - .../database/classes/database_set_constraints.php | 1 - common/database/classes/database_set_role.php | 1 - .../classes/database_set_session_authorization.php | 1 - .../database/classes/database_set_transaction.php | 1 - common/database/classes/database_show.php | 1 - .../classes/database_start_transaction.php | 1 - common/database/classes/database_truncate.php | 1 - common/database/classes/database_unlisten.php | 1 - common/database/classes/database_update.php | 1 - common/database/classes/database_vacuum.php | 1 - common/database/classes/database_values.php | 1 - common/database/interfaces/database_query.php | 25 ---- .../interfaces/database_query_parameter.php | 51 +++++++ common/database/traits/database_action.php | 30 ++-- common/database/traits/database_group_by.php | 18 +-- common/database/traits/database_in_schema.php | 30 ++-- common/database/traits/database_name.php | 18 +-- common/database/traits/database_option.php | 12 +- common/database/traits/database_order_by.php | 18 +-- common/database/traits/database_owner_to.php | 43 +++--- common/database/traits/database_rename_to.php | 16 +-- common/database/traits/database_reset.php | 40 +++--- common/database/traits/database_set.php | 60 ++++---- common/database/traits/database_set_schema.php | 16 +-- common/database/traits/database_set_tablespace.php | 16 +-- 186 files changed, 463 insertions(+), 547 deletions(-) create mode 100644 common/database/interfaces/database_query_parameter.php diff --git a/common/database/classes/database_alter_aggregate.php b/common/database/classes/database_alter_aggregate.php index 279b728..3b59fd3 100644 --- a/common/database/classes/database_alter_aggregate.php +++ b/common/database/classes/database_alter_aggregate.php @@ -40,10 +40,10 @@ class c_database_alter_aggregate extends c_database_query { public function __construct() { parent::__construct(); - $this->query_name = NULL; - $this->query_rename_to = NULL; - $this->query_owner_to = NULL; - $this->query_set_schema = NULL; + $this->name = NULL; + $this->rename_to = NULL; + $this->owner_to = NULL; + $this->set_schema = NULL; $this->aggregate_signatures = NULL; $this->order_by_signatures = NULL; @@ -53,10 +53,10 @@ class c_database_alter_aggregate extends c_database_query { * Class destructor. */ public function __destruct() { - unset($this->query_name); - unset($this->query_rename_to); - unset($this->query_owner_to); - unset($this->query_set_schema); + unset($this->name); + unset($this->rename_to); + unset($this->owner_to); + unset($this->set_schema); unset($this->aggregate_signatures); unset($this->order_by_signatures); @@ -250,12 +250,12 @@ class c_database_alter_aggregate extends c_database_query { */ public function do_build() { // the aggregate name is required. - if (!is_string($this->query_name)) { + if (!is_string($this->name)) { return new c_base_return_false(); } $this->value = static::pr_QUERY_COMMAND; - $this->value .= ' ' . $this->query_name; + $this->value .= ' ' . $this->name; $aggregate_signatures = NULL; if (!is_array($this->aggregate_modes) || empty($this->aggregate_modes)) { @@ -305,14 +305,14 @@ class c_database_alter_aggregate extends c_database_query { unset($order_by_signatures); } - if (is_string($this->query_rename_to)) { - $this->value .= ' ' . $aggregate_signatures . ' ' . c_database_string::RENAME_TO . ' (' . $this->query_rename_to . ')'; + if (is_string($this->rename_to)) { + $this->value .= ' ' . $aggregate_signatures . ' ' . c_database_string::RENAME_TO . ' (' . $this->rename_to . ')'; } - else if (is_string($this->query_owner_to_user_name)) { - $this->value .= ' ' . $aggregate_signatures . ' ' . c_database_string::OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; + else if (is_string($this->owner_to_user_name)) { + $this->value .= ' ' . $aggregate_signatures . ' ' . c_database_string::OWNER_TO . ' (' . $this->owner_to_user_name . ')'; } - else if (is_string($this->query_set_schema)) { - $this->value .= ' ' . $aggregate_signatures . ' ' . c_database_string::SET_SCHEMA . ' (' . $this->query_set_schema . ')'; + else if (is_string($this->set_schema)) { + $this->value .= ' ' . $aggregate_signatures . ' ' . c_database_string::SET_SCHEMA . ' (' . $this->set_schema . ')'; } else { unset($aggregate_signatures); diff --git a/common/database/classes/database_alter_coalation.php b/common/database/classes/database_alter_coalation.php index 8c96f95..62b0ae1 100644 --- a/common/database/classes/database_alter_coalation.php +++ b/common/database/classes/database_alter_coalation.php @@ -35,10 +35,10 @@ class c_database_alter_coalation extends c_database_query { public function __construct() { parent::__construct(); - $this->query_name = NULL; - $this->query_rename_to = NULL; - $this->query_owner_to = NULL; - $this->query_set_schema = NULL; + $this->name = NULL; + $this->rename_to = NULL; + $this->owner_to = NULL; + $this->set_schema = NULL; $this->refreh_version = NULL; } @@ -47,10 +47,10 @@ class c_database_alter_coalation extends c_database_query { * Class destructor. */ public function __destruct() { - unset($this->query_name); - unset($this->query_rename_to); - unset($this->query_owner_to); - unset($this->query_set_schema); + unset($this->name); + unset($this->rename_to); + unset($this->owner_to); + unset($this->set_schema); unset($this->refresh_version); @@ -129,26 +129,26 @@ class c_database_alter_coalation extends c_database_query { */ public function do_build() { // the collation name is required. - if (!is_string($this->query_name)) { + if (!is_string($this->name)) { return new c_base_return_false(); } $this->value = static::pr_QUERY_COMMAND; - $this->value .= ' ' . $this->query_name; + $this->value .= ' ' . $this->name; if (is_bool($this->refresh_version)) { if ($this->refresh_version) { $this->value .= ' ' . c_database_string::REFRESH_VERSION; } } - else if (is_string($this->query_rename_to)) { - $this->value .= ' ' . $this->pr_QUERY_RENAME_TO . ' (' . $this->query_rename_to . ')'; + else if (is_string($this->rename_to)) { + $this->value .= ' ' . $this->pr_QUERY_RENAME_TO . ' (' . $this->rename_to . ')'; } - else if (is_string($this->query_owner_to_user_name)) { - $this->value .= ' ' . $this->pr_QUERY_OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; + else if (is_string($this->owner_to_user_name)) { + $this->value .= ' ' . $this->pr_QUERY_OWNER_TO . ' (' . $this->owner_to_user_name . ')'; } - else if (is_string($this->query_set_schema)) { - $this->value .= ' ' . $this->pr_QUERY_SET_SCHEMA . ' (' . $this->query_set_schema . ')'; + else if (is_string($this->set_schema)) { + $this->value .= ' ' . $this->pr_QUERY_SET_SCHEMA . ' (' . $this->set_schema . ')'; } else { $this->value = NULL; diff --git a/common/database/classes/database_alter_conversion.php b/common/database/classes/database_alter_conversion.php index 100527a..4d3b95e 100644 --- a/common/database/classes/database_alter_conversion.php +++ b/common/database/classes/database_alter_conversion.php @@ -35,20 +35,20 @@ class c_database_alter_conversion extends c_database_query { public function __construct() { parent::__construct(); - $this->query_name = NULL; - $this->query_rename_to = NULL; - $this->query_owner_to = NULL; - $this->query_set_schema = NULL; + $this->name = NULL; + $this->rename_to = NULL; + $this->owner_to = NULL; + $this->set_schema = NULL; } /** * Class destructor. */ public function __destruct() { - unset($this->query_name); - unset($this->query_rename_to); - unset($this->query_owner_to); - unset($this->query_set_schema); + unset($this->name); + unset($this->rename_to); + unset($this->owner_to); + unset($this->set_schema); parent::__destruct(); } @@ -79,21 +79,21 @@ class c_database_alter_conversion extends c_database_query { */ public function do_build() { // the collation name is required. - if (!is_string($this->query_name)) { + if (!is_string($this->name)) { return new c_base_return_false(); } $this->value = static::pr_QUERY_COMMAND; - $this->value .= ' ' . $this->query_name; + $this->value .= ' ' . $this->name; - if (is_string($this->query_rename_to)) { - $this->value .= ' ' . $this->pr_QUERY_RENAME_TO . ' (' . $this->query_rename_to . ')'; + if (is_string($this->rename_to)) { + $this->value .= ' ' . $this->pr_QUERY_RENAME_TO . ' (' . $this->rename_to . ')'; } - else if (is_string($this->query_owner_to_user_name)) { - $this->value .= ' ' . $this->pr_QUERY_OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; + else if (is_string($this->owner_to_user_name)) { + $this->value .= ' ' . $this->pr_QUERY_OWNER_TO . ' (' . $this->owner_to_user_name . ')'; } - else if (is_string($this->query_set_schema)) { - $this->value .= ' ' . $this->pr_QUERY_SET_SCHEMA . ' (' . $this->query_set_schema . ')'; + else if (is_string($this->set_schema)) { + $this->value .= ' ' . $this->pr_QUERY_SET_SCHEMA . ' (' . $this->set_schema . ')'; } else { $this->value = NULL; diff --git a/common/database/classes/database_alter_database.php b/common/database/classes/database_alter_database.php index 888ddb4..a4cfc54 100644 --- a/common/database/classes/database_alter_database.php +++ b/common/database/classes/database_alter_database.php @@ -44,15 +44,15 @@ class c_database_alter_database extends c_database_query { public function __construct() { parent::__construct(); - $this->query_name = NULL; - $this->query_rename_to = NULL; - $this->query_owner_to = NULL; - $this->query_set = NULL; - $this->query_set_tablespace = NULL; - $this->query_set_parameter = NULL; - $this->query_set_value = NULL; - $this->query_reset = NULL; - $this->query_reset_parameter = NULL; + $this->name = NULL; + $this->rename_to = NULL; + $this->owner_to = NULL; + $this->set = NULL; + $this->set_tablespace = NULL; + $this->set_parameter = NULL; + $this->set_value = NULL; + $this->reset = NULL; + $this->reset_parameter = NULL; $this->option = NULL; } @@ -61,15 +61,15 @@ class c_database_alter_database extends c_database_query { * Class destructor. */ public function __destruct() { - unset($this->query_name); - unset($this->query_rename_to); - unset($this->query_owner_to); - unset($this->query_set); - unset($this->query_set_tablespace); - unset($this->query_set_parameter); - unset($this->query_set_value); - unset($this->query_reset); - unset($this->query_reset_parameter); + unset($this->name); + unset($this->rename_to); + unset($this->owner_to); + unset($this->set); + unset($this->set_tablespace); + unset($this->set_parameter); + unset($this->set_value); + unset($this->reset); + unset($this->reset_parameter); unset($this->option); @@ -148,56 +148,56 @@ class c_database_alter_database extends c_database_query { */ public function do_build() { // the database name is required. - if (!is_string($this->query_name)) { + if (!is_string($this->name)) { return new c_base_return_false(); } $this->value = static::pr_QUERY_COMMAND; - $this->value .= ' ' . $this->query_name; + $this->value .= ' ' . $this->name; if ($this->option instanceof c_database_argument_database_option) { $this->option->do_build_argument(); $this->value .= ' ' . $this->option->get_value_exact(); } - else if (is_string($this->query_rename_to)) { - $this->value .= ' ' . c_database_string::RENAME_TO . ' (' . $this->query_rename_to . ')'; + else if (is_string($this->rename_to)) { + $this->value .= ' ' . c_database_string::RENAME_TO . ' (' . $this->rename_to . ')'; } - else if (is_string($this->query_owner_to_user_name)) { - $this->value .= ' ' . c_database_string::OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; + else if (is_string($this->owner_to_user_name)) { + $this->value .= ' ' . c_database_string::OWNER_TO . ' (' . $this->owner_to_user_name . ')'; } - else if (is_string($this->query_set_tablespace)) { - $this->value .= ' ' . c_database_string::SET_TABLESPACE . ' (' . $this->query_set_tablespace . ')'; + else if (is_string($this->set_tablespace)) { + $this->value .= ' ' . c_database_string::SET_TABLESPACE . ' (' . $this->set_tablespace . ')'; } - else if (is_int($this->query_set)) { - if ($this->query_set === e_database_set::TO) { - if (is_null($this->query_set_parameter)) { - $this->value .= ' ' . c_database_string::SET . ' ' . $this->query_set_parameter . ' ' . c_database_string::TO . ' ' . c_database_string::DEFAULT; + else if (is_int($this->set)) { + if ($this->set === e_database_set::TO) { + if (is_null($this->set_parameter)) { + $this->value .= ' ' . c_database_string::SET . ' ' . $this->set_parameter . ' ' . c_database_string::TO . ' ' . c_database_string::DEFAULT; } - else if (is_string($this->query_set_parameter) && is_string($this->query_set_value)) { - $this->value .= ' ' . c_database_string::SET . ' ' . $this->query_set_parameter . ' ' . c_database_string::TO . ' ' . $this->query_set_value; + else if (is_string($this->set_parameter) && is_string($this->set_value)) { + $this->value .= ' ' . c_database_string::SET . ' ' . $this->set_parameter . ' ' . c_database_string::TO . ' ' . $this->set_value; } } - else if ($this->query_set === e_database_set::EQUAL) { - if (is_null($this->query_set_parameter)) { - $this->value .= ' ' . c_database_string::SET . ' ' . $this->query_set_parameter . ' = ' . c_database_string::DEFAULT; + else if ($this->set === e_database_set::EQUAL) { + if (is_null($this->set_parameter)) { + $this->value .= ' ' . c_database_string::SET . ' ' . $this->set_parameter . ' = ' . c_database_string::DEFAULT; } - else if (is_string($this->query_set_parameter) && is_string($this->query_set_value)) { - $this->value .= ' ' . c_database_string::SET . ' ' . $this->query_set_parameter . ' = ' . $this->query_set_value; + else if (is_string($this->set_parameter) && is_string($this->set_value)) { + $this->value .= ' ' . c_database_string::SET . ' ' . $this->set_parameter . ' = ' . $this->set_value; } } - else if ($this->query_set == e_database_set::FROM_CURRENT) { - if (is_string($this->query_set_parameter)) { - $this->value .= ' ' . c_database_string::SET . ' ' . $this->query_set_parameter . ' = ' . c_database_string::FROM_CURRENT; + else if ($this->set == e_database_set::FROM_CURRENT) { + if (is_string($this->set_parameter)) { + $this->value .= ' ' . c_database_string::SET . ' ' . $this->set_parameter . ' = ' . c_database_string::FROM_CURRENT; } } } - else if (is_string($this->query_reset)) { - if ($this->query_set === e_database_reset::PARAMETER) { - if (is_string($this->query_set_parameter)) { - $this->value .= ' ' . c_database_string::RESET . ' ' . $this->query_set_parameter; + else if (is_string($this->reset)) { + if ($this->set === e_database_reset::PARAMETER) { + if (is_string($this->set_parameter)) { + $this->value .= ' ' . c_database_string::RESET . ' ' . $this->set_parameter; } } - else if ($this->query_set === e_database_reset::ALL) { + else if ($this->set === e_database_reset::ALL) { $this->value .= ' ' . c_database_string::RESET . ' ' . c_database_string::ALL; } } diff --git a/common/database/classes/database_alter_default_privileges.php b/common/database/classes/database_alter_default_privileges.php index c6c711e..fa4dfb8 100644 --- a/common/database/classes/database_alter_default_privileges.php +++ b/common/database/classes/database_alter_default_privileges.php @@ -43,9 +43,9 @@ class c_database_alter_default_priveleges extends c_database_query { public function __construct() { parent::__construct(); - $this->query_in_schema = NULL; - $this->query_action = NULL; - $this->query_option = NULL; + $this->in_schema = NULL; + $this->action = NULL; + $this->option = NULL; $this->for_targets = NULL; $this->abbreviated = NULL; @@ -61,8 +61,8 @@ class c_database_alter_default_priveleges extends c_database_query { public function __destruct() { parent::__destruct(); - unset($this->query_in_schema); - unset($this->query_action); + unset($this->in_schema); + unset($this->action); unset($this->abbreviated); unset($this->option_grant); @@ -299,7 +299,7 @@ class c_database_alter_default_priveleges extends c_database_query { if (is_null($index)) { if (is_array($this->role_names)) { - return c_bse_return_array::s_new($this->role_names); + return c_base_return_array::s_new($this->role_names); } } else { @@ -432,7 +432,7 @@ class c_database_alter_default_priveleges extends c_database_query { return new c_base_return_false(); } - switch ($this->query_action) { + switch ($this->action) { case e_database_action::_GRANT: case e_database_action::_REVOKE: break; @@ -456,11 +456,11 @@ class c_database_alter_default_priveleges extends c_database_query { } // [ IN SCHEMA schema_name [, ... ] ] - if (is_array($this->query_in_schema) && !empty($this->query_in_schema)) { + if (is_array($this->in_schema) && !empty($this->in_schema)) { $this->value .= ' ' . c_database_string::IN . ' ' . c_database_string::SCHEMA; $names = NULL; - foreach ($this->query_in_schema as $schema_name) { + foreach ($this->in_schema as $schema_name) { $names .= ', ' . $schema_name; } @@ -468,10 +468,10 @@ class c_database_alter_default_priveleges extends c_database_query { unset($names); } - if ($this->query_action === e_database_action::ACTION_GRANT) { + if ($this->action === e_database_action::ACTION_GRANT) { $this->value .= ' ' . c_database_string::GRANT; } - else if ($this->query_action === e_database_action::ACTION_REVOKE) { + else if ($this->action === e_database_action::ACTION_REVOKE) { $this->value .= ' ' . c_database_string::REVOKE; if ($this->option_grant) { @@ -545,10 +545,10 @@ class c_database_alter_default_priveleges extends c_database_query { } // [ TO | FROM ] ... role names ... - if ($this->query_action === e_database_action::GRANT) { + if ($this->action === e_database_action::GRANT) { $this->value .= ' ' . c_database_string::TO; } - else if ($this->query_action === e_database_action::REVOKE) { + else if ($this->action === e_database_action::REVOKE) { $this->value .= ' ' . c_database_string::FROM; } @@ -562,18 +562,18 @@ class c_database_alter_default_priveleges extends c_database_query { } unset($role_name); - if ($this->query_action === e_database_action::GRANT) { + if ($this->action === e_database_action::GRANT) { // [ WITH GRANT OPTION ] if ($this->option_grant) { $this->value .= ' ' . c_database_string::WITH_GRANT_OPTION; } } - else if ($this->query_action === e_database_action::REVOKE) { + else if ($this->action === e_database_action::REVOKE) { // [ CASCADE | RESTRICT ] - if ($this->query_option === e_database_option::CASCADE) { + if ($this->option === e_database_option::CASCADE) { $this->value .= ' ' . c_database_string::CASCADE; } - else if ($this->query_option === e_database_option::RESTRICT) { + else if ($this->option === e_database_option::RESTRICT) { $this->value .= ' ' . c_database_string::RESTRICT; } } diff --git a/common/database/classes/database_alter_domain.php b/common/database/classes/database_alter_domain.php index 73da8f7..990ad6b 100644 --- a/common/database/classes/database_alter_domain.php +++ b/common/database/classes/database_alter_domain.php @@ -10,11 +10,15 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/enumerations/database_action.php'); require_once('common/database/enumerations/database_option.php'); -require_once('common/database/enumerations/database_property.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); +require_once('common/database/traits/database_name.php'); +require_once('common/database/traits/database_owner_to.php'); +require_once('common/database/traits/database_rename_to.php'); +require_once('common/database/traits/database_set_schema.php'); +require_once('common/database/traits/database_action.php'); +require_once('common/database/traits/database_option.php'); /** * The class for building and returning a Postgresql ALTER DOMAIN query string. @@ -29,7 +33,7 @@ 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_property; + use t_database_action_property; use t_database_option; protected const pr_QUERY_COMMAND = 'alter domain'; @@ -43,13 +47,13 @@ class c_database_alter_coalation extends c_database_query { public function __construct() { parent::__construct(); - $this->query_name = NULL; - $this->query_owner_to = NULL; - $this->query_rename_to = NULL; - $this->query_set_schema = NULL; - $this->query_action = NULL; - $this->query_action_property = NULL; - $this->query_option = NULL; + $this->name = NULL; + $this->owner_to = NULL; + $this->rename_to = NULL; + $this->set_schema = NULL; + $this->action = NULL; + $this->action_property = NULL; + $this->option = NULL; $this->expression = NULL; $this->contraint = NULL; @@ -60,13 +64,13 @@ class c_database_alter_coalation extends c_database_query { * Class destructor. */ public function __destruct() { - unset($this->query_name); - unset($this->query_owner_to); - unset($this->query_rename_to); - unset($this->query_set_schema); - unset($this->query_action); - unset($this->query_action_property); - unset($this->query_option); + unset($this->name); + unset($this->owner_to); + unset($this->rename_to); + unset($this->set_schema); + unset($this->action); + unset($this->action_property); + unset($this->option); unset($this->expression); unset($this->contraint); @@ -223,12 +227,12 @@ class c_database_alter_coalation extends c_database_query { * Implements do_build(). */ public function do_build() { - if (is_null($this->query_name)) { + if (is_null($this->name)) { return new c_base_return_false(); } $action = NULL; - switch ($this->query_action) { + switch ($this->action) { case e_database_action::ADD: if (!is_string($this->constraint)) { unset($action); @@ -276,12 +280,12 @@ class c_database_alter_coalation extends c_database_query { break; case e_database_action::OWNER_TO: - if (!is_string($this->query_owner_to_user_name)) { + if (!is_string($this->owner_to_user_name)) { unset($action); return new c_base_return_false(); } - $action = c_database_string::OWNER_TO . ' (' . $this->query_owner_to_user_name . ')'; + $action = c_database_string::OWNER_TO . ' (' . $this->owner_to_user_name . ')'; break; case e_database_action::RENAME_CONSTRAINT: @@ -294,12 +298,12 @@ class c_database_alter_coalation extends c_database_query { break; case e_database_action::RENAME_TO: - if (!is_string($this->query_rename_to)) { + if (!is_string($this->rename_to)) { unset($action); return new c_base_return_false(); } - $action = c_database_string::RENAME_TO . ' (' . $this->query_rename_to . ')'; + $action = c_database_string::RENAME_TO . ' (' . $this->rename_to . ')'; break; case e_database_action::SET: @@ -319,12 +323,12 @@ class c_database_alter_coalation extends c_database_query { break; case e_database_action::SET_SCHEMA: - if (!is_string($this->query_set_schema)) { + if (!is_string($this->set_schema)) { unset($action); return new c_base_return_false(); } - $action = ' ' . c_database_string::SET_SCHEMA . ' (' . $this->query_set_schema . ')'; + $action = ' ' . c_database_string::SET_SCHEMA . ' (' . $this->set_schema . ')'; break; case e_database_action::VALIDATE_CONSTRAINT: @@ -342,7 +346,7 @@ class c_database_alter_coalation extends c_database_query { } $this->value = static::pr_QUERY_COMMAND; - $this->value .= ' ' . $this->query_name; + $this->value .= ' ' . $this->name; $this->value .= ' ' . $action; return new c_base_return_true(); diff --git a/common/database/classes/database_alter_event_trigger.php b/common/database/classes/database_alter_event_trigger.php index aa3d720..e5bb3ac 100644 --- a/common/database/classes/database_alter_event_trigger.php +++ b/common/database/classes/database_alter_event_trigger.php @@ -10,7 +10,10 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); +require_once('common/database/traits/database_action.php'); +require_once('common/database/traits/database_name.php'); +require_once('common/database/traits/database_owner_to.php'); +require_once('common/database/traits/database_rename_to.php'); /** * The class for building and returning a Postgresql ALTER EVENT TRIGGER query string. diff --git a/common/database/classes/database_alter_extension.php b/common/database/classes/database_alter_extension.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_extension.php +++ b/common/database/classes/database_alter_extension.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_foreign_data_wrapper.php b/common/database/classes/database_alter_foreign_data_wrapper.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_foreign_data_wrapper.php +++ b/common/database/classes/database_alter_foreign_data_wrapper.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_foreign_table.php b/common/database/classes/database_alter_foreign_table.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_foreign_table.php +++ b/common/database/classes/database_alter_foreign_table.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_function.php b/common/database/classes/database_alter_function.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_function.php +++ b/common/database/classes/database_alter_function.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_group.php b/common/database/classes/database_alter_group.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_group.php +++ b/common/database/classes/database_alter_group.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_index.php b/common/database/classes/database_alter_index.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_index.php +++ b/common/database/classes/database_alter_index.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_language.php b/common/database/classes/database_alter_language.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_language.php +++ b/common/database/classes/database_alter_language.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_large_object.php b/common/database/classes/database_alter_large_object.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_large_object.php +++ b/common/database/classes/database_alter_large_object.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_materialized_view.php b/common/database/classes/database_alter_materialized_view.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_materialized_view.php +++ b/common/database/classes/database_alter_materialized_view.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_operator.php b/common/database/classes/database_alter_operator.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_operator.php +++ b/common/database/classes/database_alter_operator.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_operator_class.php b/common/database/classes/database_alter_operator_class.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_operator_class.php +++ b/common/database/classes/database_alter_operator_class.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_operator_family.php b/common/database/classes/database_alter_operator_family.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_operator_family.php +++ b/common/database/classes/database_alter_operator_family.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_policy.php b/common/database/classes/database_alter_policy.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_policy.php +++ b/common/database/classes/database_alter_policy.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_publication.php b/common/database/classes/database_alter_publication.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_publication.php +++ b/common/database/classes/database_alter_publication.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_role.php b/common/database/classes/database_alter_role.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_role.php +++ b/common/database/classes/database_alter_role.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_rule.php b/common/database/classes/database_alter_rule.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_rule.php +++ b/common/database/classes/database_alter_rule.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_schema.php b/common/database/classes/database_alter_schema.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_schema.php +++ b/common/database/classes/database_alter_schema.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_table.php b/common/database/classes/database_alter_table.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_table.php +++ b/common/database/classes/database_alter_table.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_tablespace.php b/common/database/classes/database_alter_tablespace.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_tablespace.php +++ b/common/database/classes/database_alter_tablespace.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_text_search_configuration.php b/common/database/classes/database_alter_text_search_configuration.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_text_search_configuration.php +++ b/common/database/classes/database_alter_text_search_configuration.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_text_search_dictionary.php b/common/database/classes/database_alter_text_search_dictionary.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_text_search_dictionary.php +++ b/common/database/classes/database_alter_text_search_dictionary.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_text_search_parser.php b/common/database/classes/database_alter_text_search_parser.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_text_search_parser.php +++ b/common/database/classes/database_alter_text_search_parser.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_text_search_template.php b/common/database/classes/database_alter_text_search_template.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_text_search_template.php +++ b/common/database/classes/database_alter_text_search_template.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_trigger.php b/common/database/classes/database_alter_trigger.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_trigger.php +++ b/common/database/classes/database_alter_trigger.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_type.php b/common/database/classes/database_alter_type.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_type.php +++ b/common/database/classes/database_alter_type.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_user.php b/common/database/classes/database_alter_user.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_user.php +++ b/common/database/classes/database_alter_user.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_user_mapping.php b/common/database/classes/database_alter_user_mapping.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_user_mapping.php +++ b/common/database/classes/database_alter_user_mapping.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_alter_view.php b/common/database/classes/database_alter_view.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_alter_view.php +++ b/common/database/classes/database_alter_view.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_analyze.php b/common/database/classes/database_analyze.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_analyze.php +++ b/common/database/classes/database_analyze.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_begin.php b/common/database/classes/database_begin.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_begin.php +++ b/common/database/classes/database_begin.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_checkpoint.php b/common/database/classes/database_checkpoint.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_checkpoint.php +++ b/common/database/classes/database_checkpoint.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_close.php b/common/database/classes/database_close.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_close.php +++ b/common/database/classes/database_close.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_cluster.php b/common/database/classes/database_cluster.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_cluster.php +++ b/common/database/classes/database_cluster.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_comment.php b/common/database/classes/database_comment.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_comment.php +++ b/common/database/classes/database_comment.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_commit.php b/common/database/classes/database_commit.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_commit.php +++ b/common/database/classes/database_commit.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_commit_prepared.php b/common/database/classes/database_commit_prepared.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_commit_prepared.php +++ b/common/database/classes/database_commit_prepared.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_copy.php b/common/database/classes/database_copy.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_copy.php +++ b/common/database/classes/database_copy.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_access_method.php b/common/database/classes/database_create_access_method.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_access_method.php +++ b/common/database/classes/database_create_access_method.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_aggregate.php b/common/database/classes/database_create_aggregate.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_aggregate.php +++ b/common/database/classes/database_create_aggregate.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_cast.php b/common/database/classes/database_create_cast.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_cast.php +++ b/common/database/classes/database_create_cast.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_collation.php b/common/database/classes/database_create_collation.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_collation.php +++ b/common/database/classes/database_create_collation.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_conversion.php b/common/database/classes/database_create_conversion.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_conversion.php +++ b/common/database/classes/database_create_conversion.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_database.php b/common/database/classes/database_create_database.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_database.php +++ b/common/database/classes/database_create_database.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_domain.php b/common/database/classes/database_create_domain.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_domain.php +++ b/common/database/classes/database_create_domain.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_event_trigger.php b/common/database/classes/database_create_event_trigger.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_event_trigger.php +++ b/common/database/classes/database_create_event_trigger.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_extension.php b/common/database/classes/database_create_extension.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_extension.php +++ b/common/database/classes/database_create_extension.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_foreign.php b/common/database/classes/database_create_foreign.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_foreign.php +++ b/common/database/classes/database_create_foreign.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_foreign_data_wrapper.php b/common/database/classes/database_create_foreign_data_wrapper.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_foreign_data_wrapper.php +++ b/common/database/classes/database_create_foreign_data_wrapper.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_function.php b/common/database/classes/database_create_function.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_function.php +++ b/common/database/classes/database_create_function.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_group.php b/common/database/classes/database_create_group.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_group.php +++ b/common/database/classes/database_create_group.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_index.php b/common/database/classes/database_create_index.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_index.php +++ b/common/database/classes/database_create_index.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_language.php b/common/database/classes/database_create_language.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_language.php +++ b/common/database/classes/database_create_language.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_materialized_view.php b/common/database/classes/database_create_materialized_view.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_materialized_view.php +++ b/common/database/classes/database_create_materialized_view.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_operator.php b/common/database/classes/database_create_operator.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_operator.php +++ b/common/database/classes/database_create_operator.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_operator_class.php b/common/database/classes/database_create_operator_class.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_operator_class.php +++ b/common/database/classes/database_create_operator_class.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_operator_family.php b/common/database/classes/database_create_operator_family.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_operator_family.php +++ b/common/database/classes/database_create_operator_family.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_policy.php b/common/database/classes/database_create_policy.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_policy.php +++ b/common/database/classes/database_create_policy.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_publication.php b/common/database/classes/database_create_publication.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_publication.php +++ b/common/database/classes/database_create_publication.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_role.php b/common/database/classes/database_create_role.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_role.php +++ b/common/database/classes/database_create_role.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_rule.php b/common/database/classes/database_create_rule.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_rule.php +++ b/common/database/classes/database_create_rule.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_schema.php b/common/database/classes/database_create_schema.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_schema.php +++ b/common/database/classes/database_create_schema.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_sequence.php b/common/database/classes/database_create_sequence.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_sequence.php +++ b/common/database/classes/database_create_sequence.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_server.php b/common/database/classes/database_create_server.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_server.php +++ b/common/database/classes/database_create_server.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_statistics.php b/common/database/classes/database_create_statistics.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_statistics.php +++ b/common/database/classes/database_create_statistics.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_subscription.php b/common/database/classes/database_create_subscription.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_subscription.php +++ b/common/database/classes/database_create_subscription.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_table.php b/common/database/classes/database_create_table.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_table.php +++ b/common/database/classes/database_create_table.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_table_as.php b/common/database/classes/database_create_table_as.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_table_as.php +++ b/common/database/classes/database_create_table_as.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_tablespace.php b/common/database/classes/database_create_tablespace.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_tablespace.php +++ b/common/database/classes/database_create_tablespace.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_text_search_configuration.php b/common/database/classes/database_create_text_search_configuration.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_text_search_configuration.php +++ b/common/database/classes/database_create_text_search_configuration.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_text_search_dictionary.php b/common/database/classes/database_create_text_search_dictionary.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_text_search_dictionary.php +++ b/common/database/classes/database_create_text_search_dictionary.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_text_search_parser.php b/common/database/classes/database_create_text_search_parser.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_text_search_parser.php +++ b/common/database/classes/database_create_text_search_parser.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_text_search_template.php b/common/database/classes/database_create_text_search_template.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_text_search_template.php +++ b/common/database/classes/database_create_text_search_template.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_transform.php b/common/database/classes/database_create_transform.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_transform.php +++ b/common/database/classes/database_create_transform.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_trigger.php b/common/database/classes/database_create_trigger.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_trigger.php +++ b/common/database/classes/database_create_trigger.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_type.php b/common/database/classes/database_create_type.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_type.php +++ b/common/database/classes/database_create_type.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_user.php b/common/database/classes/database_create_user.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_user.php +++ b/common/database/classes/database_create_user.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_user_mapping.php b/common/database/classes/database_create_user_mapping.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_user_mapping.php +++ b/common/database/classes/database_create_user_mapping.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_create_view.php b/common/database/classes/database_create_view.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_create_view.php +++ b/common/database/classes/database_create_view.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_deallocate.php b/common/database/classes/database_deallocate.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_deallocate.php +++ b/common/database/classes/database_deallocate.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_declare.php b/common/database/classes/database_declare.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_declare.php +++ b/common/database/classes/database_declare.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_delete.php b/common/database/classes/database_delete.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_delete.php +++ b/common/database/classes/database_delete.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_discard.php b/common/database/classes/database_discard.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_discard.php +++ b/common/database/classes/database_discard.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_do.php b/common/database/classes/database_do.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_do.php +++ b/common/database/classes/database_do.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_access_method.php b/common/database/classes/database_drop_access_method.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_access_method.php +++ b/common/database/classes/database_drop_access_method.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_aggregate.php b/common/database/classes/database_drop_aggregate.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_aggregate.php +++ b/common/database/classes/database_drop_aggregate.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_cast.php b/common/database/classes/database_drop_cast.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_cast.php +++ b/common/database/classes/database_drop_cast.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_collation.php b/common/database/classes/database_drop_collation.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_collation.php +++ b/common/database/classes/database_drop_collation.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_conversion.php b/common/database/classes/database_drop_conversion.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_conversion.php +++ b/common/database/classes/database_drop_conversion.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_database.php b/common/database/classes/database_drop_database.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_database.php +++ b/common/database/classes/database_drop_database.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_domain.php b/common/database/classes/database_drop_domain.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_domain.php +++ b/common/database/classes/database_drop_domain.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_event_trigger.php b/common/database/classes/database_drop_event_trigger.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_event_trigger.php +++ b/common/database/classes/database_drop_event_trigger.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_extension.php b/common/database/classes/database_drop_extension.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_extension.php +++ b/common/database/classes/database_drop_extension.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_foreign_data_wrapper.php b/common/database/classes/database_drop_foreign_data_wrapper.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_foreign_data_wrapper.php +++ b/common/database/classes/database_drop_foreign_data_wrapper.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_foreign_table.php b/common/database/classes/database_drop_foreign_table.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_foreign_table.php +++ b/common/database/classes/database_drop_foreign_table.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_function.php b/common/database/classes/database_drop_function.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_function.php +++ b/common/database/classes/database_drop_function.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_group.php b/common/database/classes/database_drop_group.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_group.php +++ b/common/database/classes/database_drop_group.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_index.php b/common/database/classes/database_drop_index.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_index.php +++ b/common/database/classes/database_drop_index.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_language.php b/common/database/classes/database_drop_language.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_language.php +++ b/common/database/classes/database_drop_language.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_materialized_view.php b/common/database/classes/database_drop_materialized_view.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_materialized_view.php +++ b/common/database/classes/database_drop_materialized_view.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_operator.php b/common/database/classes/database_drop_operator.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_operator.php +++ b/common/database/classes/database_drop_operator.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_operator_class.php b/common/database/classes/database_drop_operator_class.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_operator_class.php +++ b/common/database/classes/database_drop_operator_class.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_operator_family.php b/common/database/classes/database_drop_operator_family.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_operator_family.php +++ b/common/database/classes/database_drop_operator_family.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_owned.php b/common/database/classes/database_drop_owned.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_owned.php +++ b/common/database/classes/database_drop_owned.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_policy.php b/common/database/classes/database_drop_policy.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_policy.php +++ b/common/database/classes/database_drop_policy.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_publication.php b/common/database/classes/database_drop_publication.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_publication.php +++ b/common/database/classes/database_drop_publication.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_role.php b/common/database/classes/database_drop_role.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_role.php +++ b/common/database/classes/database_drop_role.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_rule.php b/common/database/classes/database_drop_rule.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_rule.php +++ b/common/database/classes/database_drop_rule.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_schema.php b/common/database/classes/database_drop_schema.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_schema.php +++ b/common/database/classes/database_drop_schema.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_sequence.php b/common/database/classes/database_drop_sequence.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_sequence.php +++ b/common/database/classes/database_drop_sequence.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_server.php b/common/database/classes/database_drop_server.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_server.php +++ b/common/database/classes/database_drop_server.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_statistics.php b/common/database/classes/database_drop_statistics.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_statistics.php +++ b/common/database/classes/database_drop_statistics.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_subscription.php b/common/database/classes/database_drop_subscription.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_subscription.php +++ b/common/database/classes/database_drop_subscription.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_table.php b/common/database/classes/database_drop_table.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_table.php +++ b/common/database/classes/database_drop_table.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_tablespace.php b/common/database/classes/database_drop_tablespace.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_tablespace.php +++ b/common/database/classes/database_drop_tablespace.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_text_search_configuration.php b/common/database/classes/database_drop_text_search_configuration.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_text_search_configuration.php +++ b/common/database/classes/database_drop_text_search_configuration.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_text_search_dictionary.php b/common/database/classes/database_drop_text_search_dictionary.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_text_search_dictionary.php +++ b/common/database/classes/database_drop_text_search_dictionary.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_text_search_parser.php b/common/database/classes/database_drop_text_search_parser.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_text_search_parser.php +++ b/common/database/classes/database_drop_text_search_parser.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_text_search_template.php b/common/database/classes/database_drop_text_search_template.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_text_search_template.php +++ b/common/database/classes/database_drop_text_search_template.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_transform.php b/common/database/classes/database_drop_transform.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_transform.php +++ b/common/database/classes/database_drop_transform.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_trigger.php b/common/database/classes/database_drop_trigger.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_trigger.php +++ b/common/database/classes/database_drop_trigger.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_type.php b/common/database/classes/database_drop_type.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_type.php +++ b/common/database/classes/database_drop_type.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_user.php b/common/database/classes/database_drop_user.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_user.php +++ b/common/database/classes/database_drop_user.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_user_mapping.php b/common/database/classes/database_drop_user_mapping.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_user_mapping.php +++ b/common/database/classes/database_drop_user_mapping.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_drop_view.php b/common/database/classes/database_drop_view.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_drop_view.php +++ b/common/database/classes/database_drop_view.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_end.php b/common/database/classes/database_end.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_end.php +++ b/common/database/classes/database_end.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_execute.php b/common/database/classes/database_execute.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_execute.php +++ b/common/database/classes/database_execute.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_explain.php b/common/database/classes/database_explain.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_explain.php +++ b/common/database/classes/database_explain.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_fetch.php b/common/database/classes/database_fetch.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_fetch.php +++ b/common/database/classes/database_fetch.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_grant.php b/common/database/classes/database_grant.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_grant.php +++ b/common/database/classes/database_grant.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_import_foreign_schema.php b/common/database/classes/database_import_foreign_schema.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_import_foreign_schema.php +++ b/common/database/classes/database_import_foreign_schema.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_insert.php b/common/database/classes/database_insert.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_insert.php +++ b/common/database/classes/database_insert.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_listen.php b/common/database/classes/database_listen.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_listen.php +++ b/common/database/classes/database_listen.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_load.php b/common/database/classes/database_load.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_load.php +++ b/common/database/classes/database_load.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_lock.php b/common/database/classes/database_lock.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_lock.php +++ b/common/database/classes/database_lock.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_move.php b/common/database/classes/database_move.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_move.php +++ b/common/database/classes/database_move.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_notify.php b/common/database/classes/database_notify.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_notify.php +++ b/common/database/classes/database_notify.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_prepare.php b/common/database/classes/database_prepare.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_prepare.php +++ b/common/database/classes/database_prepare.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_prepare_transaction.php b/common/database/classes/database_prepare_transaction.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_prepare_transaction.php +++ b/common/database/classes/database_prepare_transaction.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_query.php b/common/database/classes/database_query.php index a3491f7..2449aa7 100644 --- a/common/database/classes/database_query.php +++ b/common/database/classes/database_query.php @@ -19,6 +19,7 @@ require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); require_once('common/database/interfaces/database_query.php'); +require_once('common/database/interfaces/database_query_parameter.php'); /** * The base class for building and returning a Postgresql query string. @@ -237,7 +238,7 @@ abstract class c_database_query extends c_base_return_string implements i_databa * SQL queries may be passed to other SQL queries, marking them as sub-queries. * This will most commonly be added to other expressions. */ -class c_database_argument_query extends c_base_return_string implements i_database_argument { +class c_database_argument_query extends c_base_return_string implements i_database_query_parameter { protected $query; /** @@ -364,7 +365,7 @@ class c_database_argument_query extends c_base_return_string implements i_databa /** * Provide an SQL expression argument. */ -class c_database_argument_expression extends c_base_return_string implements i_database_argument { +class c_database_argument_expression extends c_base_return_string implements i_database_query_parameter { protected const pr_QUERY_AS = 'as'; protected $expression; @@ -417,7 +418,7 @@ class c_database_argument_expression extends c_base_return_string implements i_d * Expression are usually fields but also be other expressions. * Expressions may even be SQL queries. * - * @param i_database_argument|null $expression + * @param i_database_query_parameter|null $expression * The expression to assign. * Set to NULL to remove the assigned expression. * @@ -431,7 +432,7 @@ class c_database_argument_expression extends c_base_return_string implements i_d return new c_base_return_true(); } - if ($expression instanceof i_database_argument) { + if ($expression instanceof i_database_query_parameter) { $this->expression = $expression; return new c_base_return_true(); } @@ -470,7 +471,7 @@ class c_database_argument_expression extends c_base_return_string implements i_d /** * Get the assigned SQL expression. * - * @return i_database_argument|null + * @return i_database_query_parameter|null * A valid query argument. * NULL is returned if not assigned. * NULL with the error bit set is returned on error. @@ -480,7 +481,7 @@ class c_database_argument_expression extends c_base_return_string implements i_d return new c_base_return_null(); } - if ($this->expression instanceof i_database_argument) { + if ($this->expression instanceof i_database_query_parameter) { return clone($this->expression); } @@ -673,7 +674,7 @@ class c_database_argument_expression_column extends c_database_argument_expressi * This is essentially an aggregate_signature without the wildcard and ORDER BY support. * The ORDER BY support can then utilize this base without having its own wildcard and ORDER BY. */ -class c_database_argument_aggregate_signature_base extends c_base_return_string implements i_database_argument { +class c_database_argument_aggregate_signature_base extends c_base_return_string implements i_database_query_parameter { public const QUERY_ARGUMENT_MODE_NONE = 0; public const QUERY_ARGUMENT_MODE_IN = 1; public const QUERY_ARGUMENT_MODE_VARIADIC = 2; @@ -1049,7 +1050,7 @@ class c_database_argument_aggregate_signature extends c_database_argument_aggreg /** * Provide an SQL argument database option. */ -class c_database_argument_database_option extends c_base_return_string implements i_database_argument { +class c_database_argument_database_option extends c_base_return_string implements i_database_query_parameter { protected $argument_allow_connection; protected $argument_connection_limit; protected $argument_is_template; @@ -1296,7 +1297,7 @@ class c_database_argument_database_option extends c_base_return_string implement /** * Provide an SQL role name base structure. */ -class c_database_argument_role_name extends c_base_return_string implements i_database_argument { +class c_database_argument_role_name extends c_base_return_string implements i_database_query_parameter { public const QUERY_ARGUMENT_MODE_NONE = 0; public const QUERY_ARGUMENT_MODE_PUBLIC = 1; public const QUERY_ARGUMENT_MODE_NAME = 2; diff --git a/common/database/classes/database_query_parameter.php b/common/database/classes/database_query_parameter.php index 6603dcd..98b4a70 100644 --- a/common/database/classes/database_query_parameter.php +++ b/common/database/classes/database_query_parameter.php @@ -3,6 +3,15 @@ * @file * Provides classes for specific Postgesql Queries Parameter support. * + * @errata: + * There is a lot of indecision on how this is to be design/used. + * Query parameters are being provided as a possible solution and may be removed in the future. + * I need to sit down and review the design before coming to a decision. + * Until then, this is being provided as a possibility. + * That said, I am strongly considering having the SQL generation functions do the actual generation of the query parameters. + * All would leave to implement would be embeded queries, which would be handled by some aspect of this implementation. + * The query parameters (or something like that) is needed for sub-query support. + * * @see: https://www.postgresql.org/docs/current/static/sql-commands.html */ namespace n_koopa; @@ -10,54 +19,16 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -/** - * An interface used to represent a Postgresql query parameter. - * - * The query parameter represents a placeholder to the assigned value (via the implementation of some specific subclass of c_base_return_value). - * The placeholder is intended to be inserted into the query string so that something like PHP's PDO can safely convert the placeholder to a given value. - * This does not store a placeholder name itself as the class itself represents that it is a placeholder. - * - * @see: c_base_return_value - */ -interface i_database_query_parameter { - - /** - * @see: c_base_return_value::p_s_new() - */ - public static function s_new($value); - - /** - * @see: c_base_return_value::p_s_value() - */ - public static function s_value($return); +require_once('common/database/interfaces/database_query_parameter.php'); - /** - * @see: c_base_return_value::s_value_exact() - */ - public static function s_value_exact($return); - - /** - * @see: c_base_return_value::set_value() - */ - public function set_value($value); - - /** - * @see: c_base_return_value::get_value() - */ - public function get_value(); - - /** - * @see: c_base_return_value::get_value_exact() - */ - public function get_value_exact(); -} +require_once('common/database/classes/database_query.php'); /** - * A query parameter representing a boolean. + * A query parameter representing a string. * - * @see: c_base_return_bool + * @see: c_base_return_string */ -class c_database_query_parameter_bool extends c_base_return_bool implements i_database_query_parameter { +class c_database_query_parameter extends c_base_return_string implements i_database_query_parameter { /** * @see: t_base_return_value::p_s_new() @@ -77,16 +48,16 @@ class c_database_query_parameter_bool extends c_base_return_bool implements i_da * @see: t_base_return_value_exact::p_s_value_exact() */ public static function s_value_exact($return) { - return self::p_s_value_exact($return, __CLASS__, FALSE); + return self::p_s_value_exact($return, __CLASS__, ''); } } /** - * A query parameter representing a string. + * A query parameter representing a boolean. * - * @see: c_base_return_string + * @see: c_base_return_bool */ -class c_database_query_parameter_string extends c_base_return_string implements i_database_query_parameter { +class c_database_query_parameter_bool extends c_base_return_bool implements i_database_query_parameter { /** * @see: t_base_return_value::p_s_new() @@ -106,7 +77,7 @@ class c_database_query_parameter_string extends c_base_return_string implements * @see: t_base_return_value_exact::p_s_value_exact() */ public static function s_value_exact($return) { - return self::p_s_value_exact($return, __CLASS__, ''); + return self::p_s_value_exact($return, __CLASS__, FALSE); } } @@ -144,7 +115,7 @@ class c_database_query_parameter_int extends c_base_return_int implements i_data * * @see: c_base_return_float */ -class c_database_query_parameter_float extends c_base_return_value implements i_database_query_parameter { +class c_database_query_parameter_float extends c_base_return_float implements i_database_query_parameter { /** * @see: t_base_return_value::p_s_new() @@ -267,7 +238,7 @@ class c_database_query_parameter_json extends c_base_return_array implements i_d * Assigns the array from a serialized array string. * * @param string $serialized - * A serialized string to convert to an array. + * A serialized string to convert to an array. * * @return bool * TRUE on success, FALSE otherwise. @@ -304,10 +275,10 @@ class c_database_query_parameter_json extends c_base_return_array implements i_d } /** - * Returns the data as a json-serialized array string. + * Assigns the array from a json-serialized array string. * * @param string $jsonized - * A jsonized string to convert to an array. + * A jsonized string to convert to an array. * @param bool $associative * (optional) When TRUE array is return as an associative array. * @param int $options @@ -557,3 +528,82 @@ class c_database_query_parameter_set extends c_base_return_array implements i_da return FALSE; } } + +/** + * A query parameter representing an embedded query. + * + * @see: c_base_return_object + * @see: i_database_query + */ +class c_database_query_parameter_query extends c_base_return_object implements i_database_query_parameter { + + /** + * @see: t_base_return_value::p_s_new() + */ + public static function s_new($value) { + return self::p_s_new($value, __CLASS__); + } + + /** + * @see: t_base_return_value::p_s_value() + */ + public static function s_value($return) { + return self::p_s_value($return, __CLASS__); + } + + /** + * @see: t_base_return_value_exact::p_s_value_exact() + */ + public static function s_value_exact($return) { + return self::p_s_value_exact($return, __CLASS__, ''); + } + + /** + * Assign the value. + * + * @param object $value + * Any value so long as it is an object. + * This object is cloned. + * NULL is not allowed. + * + * @return bool + * TRUE on success, FALSE otherwise. + * + * @see: clone() + */ + public function set_value($value) { + $this->value = clone($value); + return parent::set_value($value); + } + + /** + * Return the value. + * + * @return object|null $value + * The value object stored within this class. + * NULL may be returned if there is no defined valid resource. + */ + public function get_value() { + if ($this->value instanceof i_database_query) { + return $this->value; + } + + $this->value = NULL; + return NULL; + } + + /** + * Return the value of the expected type. + * + * @return array $value + * The value array stored within this class. + */ + public function get_value_exact() { + if ($this->value instanceof i_database_query) { + return $this->value; + } + + $class = __CLASS__; + return new $class(); + } +} diff --git a/common/database/classes/database_reassign_owned.php b/common/database/classes/database_reassign_owned.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_reassign_owned.php +++ b/common/database/classes/database_reassign_owned.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_refresh_materialized.php b/common/database/classes/database_refresh_materialized.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_refresh_materialized.php +++ b/common/database/classes/database_refresh_materialized.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_reindex.php b/common/database/classes/database_reindex.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_reindex.php +++ b/common/database/classes/database_reindex.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_release_savepoint.php b/common/database/classes/database_release_savepoint.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_release_savepoint.php +++ b/common/database/classes/database_release_savepoint.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_reset.php b/common/database/classes/database_reset.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_reset.php +++ b/common/database/classes/database_reset.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_revoke.php b/common/database/classes/database_revoke.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_revoke.php +++ b/common/database/classes/database_revoke.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_rollback.php b/common/database/classes/database_rollback.php index 2aa118c..39b2b89 100644 --- a/common/database/classes/database_rollback.php +++ b/common/database/classes/database_rollback.php @@ -12,7 +12,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ROLLBACK query string. diff --git a/common/database/classes/database_rollback_prepared.php b/common/database/classes/database_rollback_prepared.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_rollback_prepared.php +++ b/common/database/classes/database_rollback_prepared.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_rollback_to_savepoint.php b/common/database/classes/database_rollback_to_savepoint.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_rollback_to_savepoint.php +++ b/common/database/classes/database_rollback_to_savepoint.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_savepoint.php b/common/database/classes/database_savepoint.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_savepoint.php +++ b/common/database/classes/database_savepoint.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_security_label.php b/common/database/classes/database_security_label.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_security_label.php +++ b/common/database/classes/database_security_label.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_select.php b/common/database/classes/database_select.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_select.php +++ b/common/database/classes/database_select.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_select_into.php b/common/database/classes/database_select_into.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_select_into.php +++ b/common/database/classes/database_select_into.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_set.php b/common/database/classes/database_set.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_set.php +++ b/common/database/classes/database_set.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_set_constraints.php b/common/database/classes/database_set_constraints.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_set_constraints.php +++ b/common/database/classes/database_set_constraints.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_set_role.php b/common/database/classes/database_set_role.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_set_role.php +++ b/common/database/classes/database_set_role.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_set_session_authorization.php b/common/database/classes/database_set_session_authorization.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_set_session_authorization.php +++ b/common/database/classes/database_set_session_authorization.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_set_transaction.php b/common/database/classes/database_set_transaction.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_set_transaction.php +++ b/common/database/classes/database_set_transaction.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_show.php b/common/database/classes/database_show.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_show.php +++ b/common/database/classes/database_show.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_start_transaction.php b/common/database/classes/database_start_transaction.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_start_transaction.php +++ b/common/database/classes/database_start_transaction.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_truncate.php b/common/database/classes/database_truncate.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_truncate.php +++ b/common/database/classes/database_truncate.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_unlisten.php b/common/database/classes/database_unlisten.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_unlisten.php +++ b/common/database/classes/database_unlisten.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_update.php b/common/database/classes/database_update.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_update.php +++ b/common/database/classes/database_update.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_vacuum.php b/common/database/classes/database_vacuum.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_vacuum.php +++ b/common/database/classes/database_vacuum.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/classes/database_values.php b/common/database/classes/database_values.php index 4fe2fc8..a2d73cf 100644 --- a/common/database/classes/database_values.php +++ b/common/database/classes/database_values.php @@ -10,7 +10,6 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/classes/database_query.php'); -require_once('common/database/traits/database_query.php'); /** * The class for building and returning a Postgresql ALTER COALATION query string. diff --git a/common/database/interfaces/database_query.php b/common/database/interfaces/database_query.php index 1e23129..90bcc18 100644 --- a/common/database/interfaces/database_query.php +++ b/common/database/interfaces/database_query.php @@ -31,28 +31,3 @@ interface i_database_query { */ public function do_reset(); } - -/** - * An interface for passing arguments to a query that may or may not have SQL functions. - */ -interface i_database_argument { - - /** - * Build the Postgresql query argument. - * - * @return c_base_return_bool - * TRUE is returned on success. - * FALSE without error bit set is returned if there is nothing to build. - * FALSE with the error bit set is returned on error. - */ - public function do_build_argument(); - - /** - * Reset all argument values in this class. - * - * @return c_base_return_status - * TRUE on success, FALSE otherwise. - * FALSE with the error bit set is returned on error. - */ - public function do_reset_argument(); -} diff --git a/common/database/interfaces/database_query_parameter.php b/common/database/interfaces/database_query_parameter.php new file mode 100644 index 0000000..02591d2 --- /dev/null +++ b/common/database/interfaces/database_query_parameter.php @@ -0,0 +1,51 @@ +query_action = NULL; + $this->action = NULL; return new c_base_return_true(); } if (is_int($action)) { - $this->query_action = $action; + $this->action = $action; return new c_base_return_true(); } @@ -70,12 +70,12 @@ trait t_database_action { * A single property that is associated with a particular action. */ trait t_database_action_property { - protected $query_action_property; + protected $action_property; /** * Assigns this query action property. * - * @param int|null $property + * @param int|null $action_property * Whether or not to use a action property associated. * Set to NULL to disable. * @@ -83,18 +83,18 @@ trait t_database_action_property { * TRUE on success, FALSE otherwise. * FALSE with error bit set is returned on error. */ - public function set_query_action_property($property) { - if (is_null($property)) { - $this->query_action_property = NULL; + public function set_action_property($action_property) { + if (is_null($action_property)) { + $this->action_property = NULL; return new c_base_return_true(); } - if (is_int($property)) { - $this->query_action_property = $property; + if (is_int($action_property)) { + $this->action_property = $action_property; return new c_base_return_true(); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'property', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); + $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'action_property', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } @@ -106,11 +106,11 @@ trait t_database_action_property { * NULL is returned if undefined. * FALSE with error bit set is returned on error. */ - protected function get_query_action_property() { - if (is_null($this->query_action_property)) { + protected function get_action_property() { + if (is_null($this->action_property)) { return new c_base_return_null(); } - return c_base_return_int::s_new($this->query_action_property); + return c_base_return_int::s_new($this->action_property); } } diff --git a/common/database/traits/database_group_by.php b/common/database/traits/database_group_by.php index ab720e5..07b865e 100644 --- a/common/database/traits/database_group_by.php +++ b/common/database/traits/database_group_by.php @@ -16,7 +16,7 @@ require_once('common/base/classes/base_return.php'); * Provide the sql GROUP BY functionality. */ trait t_database_group_by { - protected $query_group_by; + protected $group_by; /** * Set the GROUP BY settings. @@ -29,14 +29,14 @@ trait t_database_group_by { * TRUE on success, FALSE otherwise. * FALSE with the error bit set is returned on error. */ - public function set_query_group_by($group_by) { + public function set_group_by($group_by) { if (is_null($group_by)) { - $this->query_group_by = NULL; + $this->group_by = NULL; return new c_base_return_true(); } if (is_string($group_by)) { - $this->query_group_by = $group_by; + $this->group_by = $group_by; return new c_base_return_true(); } @@ -52,16 +52,16 @@ trait t_database_group_by { * NULL is returned if not set (group by is not to be used). * NULL with the error bit set is returned on error. */ - public function get_query_group_by() { - if (is_null($this->query_group_by)) { + public function get_group_by() { + if (is_null($this->group_by)) { return new c_base_return_null(); } - if (is_string($this->query_group_by)) { - return c_base_return_string::s_new($this->query_group_by); + if (is_string($this->group_by)) { + return c_base_return_string::s_new($this->group_by); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_group_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'group_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } } diff --git a/common/database/traits/database_in_schema.php b/common/database/traits/database_in_schema.php index fced173..5bab399 100644 --- a/common/database/traits/database_in_schema.php +++ b/common/database/traits/database_in_schema.php @@ -16,7 +16,7 @@ require_once('common/base/classes/base_return.php'); * Provide the sql IN SCHEMA functionality. */ trait t_database_in_schema { - protected $query_in_schema; + protected $in_schema; /** * Set the in schema, schema names. @@ -33,9 +33,9 @@ trait t_database_in_schema { * TRUE on success, FALSE otherwise. * FALSE with error bit set is returned on error. */ - public function set_query_in_schema($schema_name, $append = TRUE) { + public function set_in_schema($schema_name, $append = TRUE) { if (is_null($schema_name)) { - $this->query_in_schema = NULL; + $this->in_schema = NULL; return new c_base_return_true(); } @@ -46,14 +46,14 @@ trait t_database_in_schema { if (is_string($schema_name)) { if ($append) { - if (!is_array($this->query_in_schema)) { - $this->query_in_schema = []; + if (!is_array($this->in_schema)) { + $this->in_schema = []; } - $this->query_in_schema[] = $schema_name; + $this->in_schema[] = $schema_name; } else { - $this->query_in_schema = [$schema_name]; + $this->in_schema = [$schema_name]; } return new c_base_return_true(); @@ -75,26 +75,26 @@ trait t_database_in_schema { * A single schema name is returned if $index is an integer. * NULL with the error bit set is returned on error. */ - public function get_query_in_schema($index = NULL) { - if (is_null($this->query_in_schema)) { + public function get_in_schema($index = NULL) { + if (is_null($this->in_schema)) { return new c_base_return_null(); } if (is_null($index)) { - if (is_array($this->query_in_schema)) { - return c_bse_return_array::s_new($this->query_in_schema); + if (is_array($this->in_schema)) { + return c_base_return_array::s_new($this->in_schema); } } else { - if (is_int($index) && array_key_exists($index, $this->query_in_schema) && is_string($this->query_in_schema[$index])) { - return c_base_return_string::s_new($this->query_in_schema[$index]); + if (is_int($index) && array_key_exists($index, $this->in_schema) && is_string($this->in_schema[$index])) { + return c_base_return_string::s_new($this->in_schema[$index]); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_in_schema[index]', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'in_schema[index]', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_in_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'in_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } } diff --git a/common/database/traits/database_name.php b/common/database/traits/database_name.php index f35462e..469df50 100644 --- a/common/database/traits/database_name.php +++ b/common/database/traits/database_name.php @@ -16,7 +16,7 @@ require_once('common/base/classes/base_return.php'); * Provide the sql NAME functionality. */ trait t_database_name { - protected $query_name; + protected $name; /** * Set the NAME settings. @@ -29,14 +29,14 @@ trait t_database_name { * TRUE on success, FALSE otherwise. * FALSE with the error bit set is returned on error. */ - public function set_query_name($name) { + public function set_name($name) { if (is_null($name)) { - $this->query_name = NULL; + $this->name = NULL; return new c_base_return_true(); } if (is_string($name)) { - $this->query_name = $name; + $this->name = $name; return new c_base_return_true(); } @@ -52,16 +52,16 @@ trait t_database_name { * NULL is returned if not set. * NULL with the error bit set is returned on error. */ - public function get_query_name() { - if (is_null($this->query_name)) { + public function get_name() { + if (is_null($this->name)) { return new c_base_return_null(); } - if (is_string($this->query_name)) { - return c_base_return_string::s_new($this->query_name); + if (is_string($this->name)) { + return c_base_return_string::s_new($this->name); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } } diff --git a/common/database/traits/database_option.php b/common/database/traits/database_option.php index d3cec62..9b52def 100644 --- a/common/database/traits/database_option.php +++ b/common/database/traits/database_option.php @@ -16,7 +16,7 @@ require_once('common/base/classes/base_return.php'); * Provide option support for an SQL query. */ trait t_database_option { - protected $query_option; + protected $option; /** * Assigns this query option. @@ -29,14 +29,14 @@ trait t_database_option { * TRUE on success, FALSE otherwise. * FALSE with error bit set is returned on error. */ - public function set_query_option($option) { + public function set_option($option) { if (is_null($grant)) { - $this->query_option = NULL; + $this->option = NULL; return new c_base_return_true(); } if (is_int($option)) { - $this->query_option = $option; + $this->option = $option; return new c_base_return_true(); } @@ -53,10 +53,10 @@ trait t_database_option { * FALSE with error bit set is returned on error. */ protected function get_option() { - if (is_null($this->query_option)) { + if (is_null($this->option)) { return new c_base_return_null(); } - return c_base_return_int::s_new($this->query_option); + return c_base_return_int::s_new($this->option); } } diff --git a/common/database/traits/database_order_by.php b/common/database/traits/database_order_by.php index 0176a09..bc6a45d 100644 --- a/common/database/traits/database_order_by.php +++ b/common/database/traits/database_order_by.php @@ -16,7 +16,7 @@ require_once('common/base/classes/base_return.php'); * Provide the sql ORDER BY functionality. */ trait t_database_order_by { - protected $query_order_by; + protected $order_by; /** * Set the ORDER BY settings. @@ -29,14 +29,14 @@ trait t_database_order_by { * TRUE on success, FALSE otherwise. * FALSE with the error bit set is returned on error. */ - public function set_query_order_by($order_by) { + public function set_order_by($order_by) { if (is_null($order_by)) { - $this->query_order_by = NULL; + $this->order_by = NULL; return new c_base_return_true(); } if (is_string($order_by)) { - $this->query_order_by = $order_by; + $this->order_by = $order_by; return new c_base_return_true(); } @@ -52,16 +52,16 @@ trait t_database_order_by { * NULL is returned if not set (order by to is not to be used). * NULL with the error bit set is returned on error. */ - public function get_query_order_by() { - if (is_null($this->query_order_by)) { + public function get_order_by() { + if (is_null($this->order_by)) { return new c_base_return_null(); } - if (is_string($this->query_order_by)) { - return c_base_return_string::s_new($this->query_order_by); + if (is_string($this->order_by)) { + return c_base_return_string::s_new($this->order_by); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_order_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'order_by', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } } diff --git a/common/database/traits/database_owner_to.php b/common/database/traits/database_owner_to.php index 6162f3f..ed0dcd1 100644 --- a/common/database/traits/database_owner_to.php +++ b/common/database/traits/database_owner_to.php @@ -12,7 +12,6 @@ namespace n_koopa; require_once('common/base/classes/base_error.php'); require_once('common/base/classes/base_return.php'); -require_once('common/database/enumerations/database_owner_to.php'); require_once('common/database/enumerations/database_user.php'); require_once('common/database/classes/database_string.php'); @@ -21,8 +20,8 @@ require_once('common/database/classes/database_string.php'); * Provide sql OWNER TO functionality. */ trait t_database_owner_to { - protected $query_owner_to; - protected $query_owner_to_user_name; + protected $owner_to; + protected $owner_to_user_name; /** * Set the OWNER TO settings. @@ -39,10 +38,10 @@ trait t_database_owner_to { * TRUE on success, FALSE otherwise. * FALSE with the error bit set is returned on error. */ - public function set_query_owner_to($owner_to, $user_name = NULL) { + public function set_owner_to($owner_to, $user_name = NULL) { if (is_null($owner_to)) { - $this->query_owner_to = NULL; - $this->query_owner_to_user_name = NULL; + $this->owner_to = NULL; + $this->owner_to_user_name = NULL; return new c_base_return_true(); } @@ -57,8 +56,8 @@ trait t_database_owner_to { return c_base_return_error::s_false($error); } - $this->query_owner_to = $owner_to; - $this->query_owner_to_user_name = $user_name; + $this->owner_to = $owner_to; + $this->owner_to_user_name = $user_name; return new c_base_return_true(); } @@ -67,14 +66,14 @@ trait t_database_owner_to { return c_base_return_error::s_false($error); } - $this->query_owner_to = $owner_to; - $this->query_owner_to_user_name = NULL; + $this->owner_to = $owner_to; + $this->owner_to_user_name = NULL; if ($owner_type == e_database_user::CURRENT) { - $this->query_owner_to_user_name = c_database_string::USER_CURRENT; + $this->owner_to_user_name = c_database_string::USER_CURRENT; } else if ($owner_type == e_database_user::SESSION) { - $this->query_owner_to_user_name = c_database_string::USER_SESSION; + $this->owner_to_user_name = c_database_string::USER_SESSION; } return new c_base_return_true(); @@ -88,16 +87,16 @@ trait t_database_owner_to { * NULL without error bit set is returned if not assigned. * NULL with the error bit set is returned on error. */ - public function get_query_owner_to() { - if (is_null($this->query_owner_to)) { + public function get_owner_to() { + if (is_null($this->owner_to)) { return new c_base_return_null(); } - if (is_int($this->query_owner_to)) { - return c_base_return_int::s_new($this->query_owner_to); + if (is_int($this->owner_to)) { + return c_base_return_int::s_new($this->owner_to); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_owner_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'owner_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } @@ -109,16 +108,16 @@ trait t_database_owner_to { * NULL without error bit set is returned if not assigned. * NULL with the error bit set is returned on error. */ - public function get_query_owner_to_user_name() { - if (is_null($this->query_owner_to_user_name)) { + public function get_owner_to_user_name() { + if (is_null($this->owner_to_user_name)) { return new c_base_return_null(); } - if (is_string($this->query_owner_to_user_name)) { - return c_base_return_string::s_new($this->query_owner_to_user_name); + if (is_string($this->owner_to_user_name)) { + return c_base_return_string::s_new($this->owner_to_user_name); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_owner_to_user_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'owner_to_user_name', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } } diff --git a/common/database/traits/database_rename_to.php b/common/database/traits/database_rename_to.php index 7b987cc..297e08c 100644 --- a/common/database/traits/database_rename_to.php +++ b/common/database/traits/database_rename_to.php @@ -16,7 +16,7 @@ require_once('common/base/classes/base_return.php'); * Provide the sql RENAME TO functionality. */ trait t_database_rename_to { - protected $query_rename_to; + protected $rename_to; /** * Set the RENAME TO settings. @@ -29,13 +29,13 @@ trait t_database_rename_to { * TRUE on success, FALSE otherwise. * FALSE with the error bit set is returned on error. */ - public function set_query_rename_to($rename_to) { + public function set_rename_to($rename_to) { if (!is_null($rename_to) && !is_string($rename_to)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'rename_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } - $this->query_rename_to = $rename_to; + $this->rename_to = $rename_to; return new c_base_return_true(); } @@ -47,16 +47,16 @@ trait t_database_rename_to { * NULL is returned if not set (rename to is not to be used). * NULL with the error bit set is returned on error. */ - public function get_query_rename_to() { - if (is_null($this->query_rename_to)) { + public function get_rename_to() { + if (is_null($this->rename_to)) { return new c_base_return_null(); } - if (is_string($this->query_rename_to)) { - return c_base_return_string::s_new($this->query_rename_to); + if (is_string($this->rename_to)) { + return c_base_return_string::s_new($this->rename_to); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_rename_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'rename_to', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } } diff --git a/common/database/traits/database_reset.php b/common/database/traits/database_reset.php index 1d8c753..862f66b 100644 --- a/common/database/traits/database_reset.php +++ b/common/database/traits/database_reset.php @@ -14,14 +14,12 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/enumerations/database_reset.php'); -require_once('common/database/classes/database_code.php'); - /** * Provide the sql RESET functionality. */ trait t_database_reset { - protected $query_reset; - protected $query_reset_parameter; + protected $reset; + protected $reset_parameter; /** * Set the RESET settings. @@ -38,10 +36,10 @@ trait t_database_reset { * TRUE on success, FALSE otherwise. * FALSE with the error bit set is returned on error. */ - public function set_query_reset($reset, $parameter = NULL) { + public function set_reset($reset, $parameter = NULL) { if (is_null($reset)) { - $this->query_reset = NULL; - $this->query_reset_parameter = NULL; + $this->reset = NULL; + $this->reset_parameter = NULL; return new c_base_return_true(); } @@ -56,13 +54,13 @@ trait t_database_reset { return c_base_return_error::s_false($error); } - $this->query_reset = $reset; - $this->query_reset_parameter = $parameter; + $this->reset = $reset; + $this->reset_parameter = $parameter; return new c_base_return_true(); } else if ($reset == e_database_reset::ALL) { - $this->query_reset = $reset; - $this->query_reset_parameter = NULL; + $this->reset = $reset; + $this->reset_parameter = NULL; return new c_base_return_true(); } @@ -77,16 +75,16 @@ trait t_database_reset { * NULL is returned if not set (reset tablespace is not to be used). * NULL with the error bit set is returned on error. */ - public function get_query_reset() { - if (is_null($this->query_reset)) { + public function get_reset() { + if (is_null($this->reset)) { return new c_base_return_null(); } - if (is_int($this->query_reset)) { - return c_base_return_int::s_new($this->query_reset); + if (is_int($this->reset)) { + return c_base_return_int::s_new($this->reset); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_reset', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'reset', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } @@ -98,16 +96,16 @@ trait t_database_reset { * NULL without error bit reset is returned if not assigned. * NULL with the error bit reset is returned on error. */ - public function get_query_reset_parameter() { - if (is_null($this->query_reset_parameter)) { + public function get_reset_parameter() { + if (is_null($this->reset_parameter)) { return new c_base_return_null(); } - if (is_string($this->query_reset_parameter)) { - return c_base_return_string::s_new($this->query_reset_parameter); + if (is_string($this->reset_parameter)) { + return c_base_return_string::s_new($this->reset_parameter); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_reset_parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'reset_parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } } diff --git a/common/database/traits/database_set.php b/common/database/traits/database_set.php index 93837f4..90ebb61 100644 --- a/common/database/traits/database_set.php +++ b/common/database/traits/database_set.php @@ -14,22 +14,20 @@ require_once('common/base/classes/base_return.php'); require_once('common/database/enumerations/database_set.php'); -require_once('common/database/classes/database_code.php'); - /** * Provide the sql SET functionality. */ trait t_database_set { - protected $query_set; - protected $query_set_parameter; - protected $query_set_value; + protected $set; + protected $set_parameter; + protected $set_value; /** * Set the SET settings. * * @param int|null $set * The SET code to assign. - * Should be one of: c_database_code_set. + * Should be one of: e_database_set. * Set to NULL to disable. * @param string|null $parameter * (optional) When non-NULL this is the configuration parameter. @@ -42,11 +40,11 @@ trait t_database_set { * TRUE on success, FALSE otherwise. * FALSE with the error bit set is returned on error. */ - public function set_query_set($set, $parameter = NULL, $value = NULL) { + public function set_set($set, $parameter = NULL, $value = NULL) { if (is_null($set)) { - $this->query_set = NULL; - $this->query_set_parameter = NULL; - $this->query_set_value = NULL; + $this->set = NULL; + $this->set_parameter = NULL; + $this->set_value = NULL; return new c_base_return_true(); } @@ -66,15 +64,15 @@ trait t_database_set { return c_base_return_error::s_false($error); } - $this->query_set = $set; - $this->query_set_parameter = $parameter; - $this->query_set_value = $value; + $this->set = $set; + $this->set_parameter = $parameter; + $this->set_value = $value; return new c_base_return_true(); } else if ($set == e_database_set::FROM_CURRENT) { - $this->query_set = $set; - $this->query_set_parameter = NULL; - $this->query_set_value = NULL; + $this->set = $set; + $this->set_parameter = NULL; + $this->set_value = NULL; return new c_base_return_true(); } @@ -89,16 +87,16 @@ trait t_database_set { * NULL is returned if not set (set tablespace is not to be used). * NULL with the error bit set is returned on error. */ - public function get_query_set() { - if (is_null($this->query_set)) { + public function get_set() { + if (is_null($this->set)) { return new c_base_return_null(); } - if (is_int($this->query_set)) { - return c_base_return_int::s_new($this->query_set); + if (is_int($this->set)) { + return c_base_return_int::s_new($this->set); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'set', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } @@ -110,16 +108,16 @@ trait t_database_set { * NULL without error bit set is returned if not assigned. * NULL with the error bit set is returned on error. */ - public function get_query_set_parameter() { - if (is_null($this->query_set_parameter)) { + public function get_set_parameter() { + if (is_null($this->set_parameter)) { return new c_base_return_null(); } - if (is_string($this->query_set_parameter)) { - return c_base_return_string::s_new($this->query_set_parameter); + if (is_string($this->set_parameter)) { + return c_base_return_string::s_new($this->set_parameter); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'set_parameter', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } @@ -131,16 +129,16 @@ trait t_database_set { * NULL without error bit set is returned if not assigned. * NULL with the error bit set is returned on error. */ - public function get_query_set_value() { - if (is_null($this->query_set_value)) { + public function get_set_value() { + if (is_null($this->set_value)) { return new c_base_return_null(); } - if (is_string($this->query_set_value)) { - return c_base_return_string::s_new($this->query_set_value); + if (is_string($this->set_value)) { + return c_base_return_string::s_new($this->set_value); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_value', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'set_value', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } } diff --git a/common/database/traits/database_set_schema.php b/common/database/traits/database_set_schema.php index 4886690..aeb5798 100644 --- a/common/database/traits/database_set_schema.php +++ b/common/database/traits/database_set_schema.php @@ -18,7 +18,7 @@ require_once('common/database/classes/database_string.php'); * Provide the sql SET SCHEMA functionality. */ trait t_database_set_schema { - protected $query_set_schema; + protected $set_schema; /** * Set the RENAME TO settings. @@ -31,13 +31,13 @@ trait t_database_set_schema { * TRUE on success, FALSE otherwise. * FALSE with the error bit set is returned on error. */ - public function set_query_set_schema($set_schema) { + public function set_set_schema($set_schema) { if (!is_null($set_schema) && !is_string($set_schema)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'set_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } - $this->query_set_schema = $set_schema; + $this->set_schema = $set_schema; return new c_base_return_true(); } @@ -49,16 +49,16 @@ trait t_database_set_schema { * NULL is returned if not set (set schema is not to be used). * NULL with the error bit set is returned on error. */ - public function get_query_set_schema() { - if (is_null($this->query_set_schema)) { + public function get_set_schema() { + if (is_null($this->set_schema)) { return new c_base_return_null(); } - if (is_string($this->query_set_schema)) { - return c_base_return_string::s_new($this->query_set_schema); + if (is_string($this->set_schema)) { + return c_base_return_string::s_new($this->set_schema); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'set_schema', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } } diff --git a/common/database/traits/database_set_tablespace.php b/common/database/traits/database_set_tablespace.php index c25e2c6..b126271 100644 --- a/common/database/traits/database_set_tablespace.php +++ b/common/database/traits/database_set_tablespace.php @@ -16,7 +16,7 @@ require_once('common/base/classes/base_return.php'); * Provide the sql SET TABLESPACE functionality. */ trait t_database_set_tablespace { - protected $query_set_tablespace; + protected $set_tablespace; /** * Set the SET TABLESPACE settings. @@ -29,13 +29,13 @@ trait t_database_set_tablespace { * TRUE on success, FALSE otherwise. * FALSE with the error bit set is returned on error. */ - public function set_query_set_tablespace($set_tablespace) { + public function set_set_tablespace($set_tablespace) { if (!is_null($set_tablespace) && !is_string($set_tablespace)) { $error = c_base_error::s_log(NULL, ['arguments' => [':{argument_name}' => 'set_tablespace', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_ARGUMENT); return c_base_return_error::s_false($error); } - $this->query_set_tablespace = $set_tablespace; + $this->set_tablespace = $set_tablespace; return new c_base_return_true(); } @@ -47,16 +47,16 @@ trait t_database_set_tablespace { * NULL is returned if not set (set tablespace is not to be used). * NULL with the error bit set is returned on error. */ - public function get_query_set_tablespace() { - if (is_null($this->query_set_tablespace)) { + public function get_set_tablespace() { + if (is_null($this->set_tablespace)) { return new c_base_return_null(); } - if (is_string($this->query_set_tablespace)) { - return c_base_return_string::s_new($this->query_set_tablespace); + if (is_string($this->set_tablespace)) { + return c_base_return_string::s_new($this->set_tablespace); } - $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'query_set_tablespace', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); + $error = c_base_error::s_log(NULL, ['arguments' => [':{variable_name}' => 'set_tablespace', ':{function_name}' => __CLASS__ . '->' . __FUNCTION__]], i_base_error_messages::INVALID_VARIABLE); return c_base_return_error::s_null($error); } } -- 1.8.3.1