mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 01:44:27 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-29415' of git://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2011-09-19 11:15:04 +12:00
commit 2b834a1d06
2 changed files with 6 additions and 2 deletions

7
lib/dml/oci_native_moodle_database.php

@ -477,8 +477,11 @@ class oci_native_moodle_database extends moodle_database {
$this->columns[$table] = array();
$sql = "SELECT CNAME, COLTYPE, WIDTH, SCALE, PRECISION, NULLS, DEFAULTVAL
FROM COL
// We give precedence to CHAR_LENGTH for VARCHAR2 columns over WIDTH because the former is always
// BYTE based and, for cross-db operations, we want CHAR based results. See MDL-29415
$sql = "SELECT CNAME, COLTYPE, nvl(CHAR_LENGTH, WIDTH) AS WIDTH, SCALE, PRECISION, NULLS, DEFAULTVAL
FROM COL c
LEFT JOIN USER_TAB_COLUMNS u ON (u.TABLE_NAME = c.TNAME AND u.COLUMN_NAME = c.CNAME AND u.DATA_TYPE = 'VARCHAR2')
WHERE TNAME = UPPER('{" . $table . "}')
ORDER BY COLNO";

1
lib/dml/simpletest/testdml.php

@ -751,6 +751,7 @@ class dml_test extends UnitTestCase {
$field = $columns['name'];
$this->assertEqual('C', $field->meta_type);
$this->assertFalse($field->auto_increment);
$this->assertEqual(255, $field->max_length);
$this->assertTrue($field->has_default);
$this->assertIdentical('lala', $field->default_value);
$this->assertFalse($field->not_null);