From 12e89a0a69c97adebb60c0c5cd3ceba438611b81 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Thu, 29 Sep 2011 00:13:44 +0200
Subject: [PATCH 1/2] MDL-29566 unit tests - add some tests to cover
 get_columns() with number/float columns

---
 lib/dml/simpletest/testdml.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/dml/simpletest/testdml.php b/lib/dml/simpletest/testdml.php
index a4e6e9327a2..ae2f4bf1748 100644
--- a/lib/dml/simpletest/testdml.php
+++ b/lib/dml/simpletest/testdml.php
@@ -727,6 +727,8 @@ class dml_test extends UnitTestCase {
         $table->add_field('description', XMLDB_TYPE_TEXT, 'small', null, null, null, null);
         $table->add_field('enumfield', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, 'test2');
         $table->add_field('onenum', XMLDB_TYPE_NUMBER, '10,2', null, null, null, 200);
+        $table->add_field('onefloat', XMLDB_TYPE_FLOAT, '10,2', null, null, null, 300);
+        $table->add_field('anotherfloat', XMLDB_TYPE_FLOAT, null, null, null, null, 400);
         $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
         $dbman->create_table($table);
 
@@ -772,10 +774,26 @@ class dml_test extends UnitTestCase {
         $field = $columns['onenum'];
         $this->assertEqual('N', $field->meta_type);
         $this->assertFalse($field->auto_increment);
+        $this->assertEqual(10, $field->max_length);
+        $this->assertEqual(2, $field->scale);
         $this->assertTrue($field->has_default);
         $this->assertEqual(200.0, $field->default_value);
         $this->assertFalse($field->not_null);
 
+        $field = $columns['onefloat'];
+        $this->assertEqual('N', $field->meta_type);
+        $this->assertFalse($field->auto_increment);
+        $this->assertTrue($field->has_default);
+        $this->assertEqual(300.0, $field->default_value);
+        $this->assertFalse($field->not_null);
+
+        $field = $columns['anotherfloat'];
+        $this->assertEqual('N', $field->meta_type);
+        $this->assertFalse($field->auto_increment);
+        $this->assertTrue($field->has_default);
+        $this->assertEqual(400.0, $field->default_value);
+        $this->assertFalse($field->not_null);
+
         for ($i = 0; $i < count($columns); $i++) {
             if ($i == 0) {
                 $next_column = reset($columns);

From 61e55061a60b45736b778cf0334bde2664558233 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Thu, 29 Sep 2011 00:15:49 +0200
Subject: [PATCH 2/2] MDL-29566 mysql - length / decimal specs in float columns
 are optional

---
 lib/dml/mysqli_native_moodle_database.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index 165adaeb16a..1bac5875360 100644
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -489,7 +489,7 @@ class mysqli_native_moodle_database extends moodle_database {
                     $info->unique        = null;
                 }
 
-            } else if (preg_match('/(decimal|double|float)\((\d+),(\d+)\)/i', $rawcolumn->type, $matches)) {
+            } else if (preg_match('/(decimal)\((\d+),(\d+)\)/i', $rawcolumn->type, $matches)) {
                 $info->type          = $matches[1];
                 $info->meta_type     = 'N';
                 $info->max_length    = $matches[2];
@@ -503,6 +503,20 @@ class mysqli_native_moodle_database extends moodle_database {
                 $info->auto_increment= false;
                 $info->unique        = null;
 
+            } else if (preg_match('/(double|float)(\((\d+),(\d+)\))?/i', $rawcolumn->type, $matches)) {
+                $info->type          = $matches[1];
+                $info->meta_type     = 'N';
+                $info->max_length    = isset($matches[3]) ? $matches[3] : null;
+                $info->scale         = isset($matches[4]) ? $matches[4] : null;
+                $info->not_null      = ($rawcolumn->null === 'NO');
+                $info->default_value = $rawcolumn->default;
+                $info->has_default   = is_null($info->default_value) ? false : true;
+                $info->primary_key   = ($rawcolumn->key === 'PRI');
+                $info->binary        = false;
+                $info->unsigned      = (stripos($rawcolumn->type, 'unsigned') !== false);
+                $info->auto_increment= false;
+                $info->unique        = null;
+
             } else if (preg_match('/([a-z]*text)/i', $rawcolumn->type, $matches)) {
                 $info->type          = $matches[1];
                 $info->meta_type     = 'X';