From cdb1e987e6cd6176e6508ad422eabcb1c133137f Mon Sep 17 00:00:00 2001 From: stronk7 Date: Fri, 23 May 2008 22:42:45 +0000 Subject: [PATCH] All fields, keys and indexes in suggested PHP core are using $dbman. MDL-14941 --- .../view_table_php/view_table_php.class.php | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/admin/xmldb/actions/view_table_php/view_table_php.class.php b/admin/xmldb/actions/view_table_php/view_table_php.class.php index 1448616b936d9..c0f7da7fd2217 100644 --- a/admin/xmldb/actions/view_table_php/view_table_php.class.php +++ b/admin/xmldb/actions/view_table_php/view_table_php.class.php @@ -336,8 +336,8 @@ function add_field_php($structure, $table, $field) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Conditionally launch add field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' if (!field_exists($table, $field)) {'. XMLDB_LINEFEED; - $result .= ' $result = $result && add_field($table, $field);' . XMLDB_LINEFEED; + $result .= ' if (!$dbman->field_exists($table, $field)) {'. XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->add_field($table, $field);' . XMLDB_LINEFEED; $result .= ' }'. XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call @@ -384,8 +384,8 @@ function drop_field_php($structure, $table, $field) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Conditionally launch drop field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' if (field_exists($table, $field)) {' . XMLDB_LINEFEED; - $result .= ' $result = $result && drop_field($table, $field);' . XMLDB_LINEFEED; + $result .= ' if ($dbman->field_exists($table, $field)) {' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->drop_field($table, $field);' . XMLDB_LINEFEED; $result .= ' }' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call @@ -432,7 +432,7 @@ function rename_field_php($structure, $table, $field) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch rename field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && rename_field($table, $field, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->rename_field($table, $field, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure); @@ -487,7 +487,7 @@ function change_field_type_php($structure, $table, $field) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of type for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && change_field_type($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->change_field_type($table, $field);' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure); @@ -539,7 +539,7 @@ function change_field_precision_php($structure, $table, $field) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of precision for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && change_field_precision($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->change_field_precision($table, $field);' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure); @@ -587,7 +587,7 @@ function change_field_unsigned_php($structure, $table, $field) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of sign for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && change_field_unsigned($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->change_field_unsigned($table, $field);' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure); @@ -635,7 +635,7 @@ function change_field_notnull_php($structure, $table, $field) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of nullability for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && change_field_notnull($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->change_field_notnull($table, $field);' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure); @@ -684,7 +684,7 @@ function change_field_enum_php($structure, $table, $field) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of list of values for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && change_field_enum($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->change_field_enum($table, $field);' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure); @@ -732,7 +732,7 @@ function change_field_default_php($structure, $table, $field) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch change of default for field ' . $field->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && change_field_default($table, $field);' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->change_field_default($table, $field);' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure); @@ -778,7 +778,7 @@ function add_key_php($structure, $table, $key) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch add key ' . $key->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && add_key($table, $key);' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->add_key($table, $key);' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure); @@ -824,7 +824,7 @@ function drop_key_php($structure, $table, $key) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch drop key ' . $key->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && drop_key($table, $key);' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->drop_key($table, $key);' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure); @@ -873,7 +873,7 @@ function rename_key_php($structure, $table, $key) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch rename key ' . $key->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && rename_key($table, $key, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->rename_key($table, $key, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure); @@ -919,8 +919,8 @@ function add_index_php($structure, $table, $index) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Conditionally launch add index ' . $index->getName() . XMLDB_LINEFEED; - $result .= ' if (!index_exists($table, $index) {' . XMLDB_LINEFEED; - $result .= ' $result = $result && add_index($table, $index);' . XMLDB_LINEFEED; + $result .= ' if (!$dbman->index_exists($table, $index) {' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->add_index($table, $index);' . XMLDB_LINEFEED; $result .= ' }' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call @@ -967,8 +967,8 @@ function drop_index_php($structure, $table, $index) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Conditionally launch drop index ' . $index->getName() . XMLDB_LINEFEED; - $result .= ' if (index_exists($table, $index) {' . XMLDB_LINEFEED; - $result .= ' $result = $result && drop_index($table, $index);' . XMLDB_LINEFEED; + $result .= ' if ($dbman->index_exists($table, $index) {' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->drop_index($table, $index);' . XMLDB_LINEFEED; $result .= ' }' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call @@ -1018,7 +1018,7 @@ function rename_index_php($structure, $table, $index) { /// Launch the proper DDL $result .= XMLDB_LINEFEED; $result .= ' /// Launch rename index ' . $index->getName() . XMLDB_LINEFEED; - $result .= ' $result = $result && rename_index($table, $index, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; + $result .= ' $result = $result && $dbman->rename_index($table, $index, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED; /// Add the proper upgrade_xxxx_savepoint call $result .= $this->upgrade_savepoint_php ($structure);