mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity

PHP generated code must use $result instead of $status. MDL-7533

Browse Source 
Merged from MOODLE_17_STABLE
This commit is contained in:
stronk7 2006-11-18 19:08:10 +00:00
parent dce744cc05
commit db9940b605
3 changed files with 19 additions and 19 deletions
admin/xmldb/actions
view_structure_php
view_structure_php.class.php
view_table_php
view_table_php.class.php
lib/xmldb/classes
XMLDBConstants.php

6
admin/xmldb/actions/view_structure_php/view_structure_php.class.php

@ -211,7 +211,7 @@ class view_structure_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch create table for ' . $table->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && create_table($table);' . XMLDB_LINEFEED;
$result .= ' $result = $result && create_table($table);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -249,7 +249,7 @@ class view_structure_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch drop table for ' . $table->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && drop_table($table);' . XMLDB_LINEFEED;
$result .= ' $result = $result && drop_table($table);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -287,7 +287,7 @@ class view_structure_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch rename table for ' . $table->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && rename_table($table, ' . "'NEWNAMEGOESHERE'" . ');' . XMLDB_LINEFEED;
$result .= ' $result = $result && rename_table($table, ' . "'NEWNAMEGOESHERE'" . ');' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;

30
admin/xmldb/actions/view_table_php/view_table_php.class.php

@ -336,7 +336,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch add field ' . $field->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && add_field($table, $field);' . XMLDB_LINEFEED;
$result .= ' $result = $result && add_field($table, $field);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -379,7 +379,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch drop field ' . $field->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && drop_field($table, $field);' . XMLDB_LINEFEED;
$result .= ' $result = $result && drop_field($table, $field);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -422,7 +422,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch rename field ' . $field->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && rename_field($table, $field, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
$result .= ' $result = $result && rename_field($table, $field, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -475,7 +475,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch change of type for field ' . $field->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && change_field_type($table, $field);' . XMLDB_LINEFEED;
$result .= ' $result = $result && change_field_type($table, $field);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -525,7 +525,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch change of precision for field ' . $field->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && change_field_precision($table, $field);' . XMLDB_LINEFEED;
$result .= ' $result = $result && change_field_precision($table, $field);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -571,7 +571,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch change of sign for field ' . $field->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && change_field_unsigned($table, $field);' . XMLDB_LINEFEED;
$result .= ' $result = $result && change_field_unsigned($table, $field);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -617,7 +617,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch change of nullability for field ' . $field->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && change_field_notnull($table, $field);' . XMLDB_LINEFEED;
$result .= ' $result = $result && change_field_notnull($table, $field);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -664,7 +664,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch change of list of values for field ' . $field->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && change_field_enum($table, $field);' . XMLDB_LINEFEED;
$result .= ' $result = $result && change_field_enum($table, $field);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -710,7 +710,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch change of default for field ' . $field->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && change_field_default($table, $field);' . XMLDB_LINEFEED;
$result .= ' $result = $result && change_field_default($table, $field);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -754,7 +754,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch add key ' . $key->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && add_key($table, $key);' . XMLDB_LINEFEED;
$result .= ' $result = $result && add_key($table, $key);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -798,7 +798,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch drop key ' . $key->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && drop_key($table, $key);' . XMLDB_LINEFEED;
$result .= ' $result = $result && drop_key($table, $key);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -845,7 +845,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch rename key ' . $key->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && rename_key($table, $key, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
$result .= ' $result = $result && rename_key($table, $key, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -889,7 +889,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch add index ' . $index->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && add_index($table, $index);' . XMLDB_LINEFEED;
$result .= ' $result = $result && add_index($table, $index);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -933,7 +933,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch drop index ' . $index->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && drop_index($table, $index);' . XMLDB_LINEFEED;
$result .= ' $result = $result && drop_index($table, $index);' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;
@ -980,7 +980,7 @@ class view_table_php extends XMLDBAction {
/// Launch the proper DDL
$result .= XMLDB_LINEFEED;
$result .= ' /// Launch rename index ' . $index->getName() . XMLDB_LINEFEED;
$result .= ' $status = $status && rename_index($table, $index, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
$result .= ' $result = $result && rename_index($table, $index, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
/// Add standard PHP footer
$result .= XMLDB_PHP_FOOTER;

2
lib/xmldb/classes/XMLDBConstants.php

@ -69,6 +69,6 @@
/// Some strings used widely
define ('XMLDB_LINEFEED', "\n");
define ('XMLDB_PHP_HEADER', ' if ($status && $oldversion < XXXXXXXXXX) {' . XMLDB_LINEFEED);
define ('XMLDB_PHP_HEADER', ' if ($result && $oldversion < XXXXXXXXXX) {' . XMLDB_LINEFEED);
define ('XMLDB_PHP_FOOTER', ' }' . XMLDB_LINEFEED);
?>