mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 04:01:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Marina Glancy 2013-11-07 15:06:38 +11:00
commit 1dd53c7a5a
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ddl/tests/ddl_test.php
View File

@ -698,6 +698,16 @@ class core_ddl_testcase extends database_driver_testcase {
$this->assertSame('N', $columns['onenumber']->meta_type);
$this->assertEquals(2.550, $DB->get_field('test_table1', 'onenumber', array(), IGNORE_MULTIPLE)); // Check default has been applied.
// Add one numeric field with scale of 0 and check it.
$field = new xmldb_field('onenumberwith0scale');
$field->set_attributes(XMLDB_TYPE_NUMBER, '6,0', null, XMLDB_NOTNULL, null, 2);
$dbman->add_field($table, $field);
$this->assertTrue($dbman->field_exists($table, 'onenumberwith0scale'));
$columns = $DB->get_columns('test_table1');
$this->assertEquals(6, $columns['onenumberwith0scale']->max_length);
// We can not use assertEquals as that accepts null/false as a valid value.
$this->assertSame('0', strval($columns['onenumberwith0scale']->scale));
// Add one float field and check it (not official type - must work as number).
$field = new xmldb_field('onefloat');
$field->set_attributes(XMLDB_TYPE_FLOAT, '6,3', null, XMLDB_NOTNULL, null, 3.550);

2
lib/dml/mssql_native_moodle_database.php
View File

@ -475,7 +475,7 @@ class mssql_native_moodle_database extends moodle_database {
}
// Scale
$info->scale = $rawcolumn->scale ? $rawcolumn->scale : false;
$info->scale = $rawcolumn->scale;
// Prepare not_null info
$info->not_null = $rawcolumn->is_nullable == 'NO' ? true : false;

2
lib/dml/oci_native_moodle_database.php
View File

@ -565,7 +565,7 @@ class oci_native_moodle_database extends moodle_database {
$info->meta_type = 'I';
$info->unique = null;
}
$info->scale = null;
$info->scale = 0;
} else {
//float