From: stronk7 <stronk7>
Date: Mon, 25 Sep 2006 21:44:21 +0000 (+0000)
Subject: Prevent NOT NULL fields to have one DEFAULT NULL clause
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0db2d6bb98e5243415f9ad9d7fc01ed1e94506a1;p=moodle.git

Prevent NOT NULL fields to have one DEFAULT NULL clause
---

diff --git a/lib/xmldb/classes/generators/XMLDBGenerator.class.php b/lib/xmldb/classes/generators/XMLDBGenerator.class.php
index 7786bfc47d..fccf3d52c0 100644
--- a/lib/xmldb/classes/generators/XMLDBGenerator.class.php
+++ b/lib/xmldb/classes/generators/XMLDBGenerator.class.php
@@ -440,7 +440,7 @@ class XMLDBgenerator {
             /// never applying defaults to TEXT and BINARY fields
                 if ($this->drop_default_clause_required &&
                     $xmldb_field->getType() != XMLDB_TYPE_TEXT &&
-                    $xmldb_field->getType() != XMLDB_TYPE_BINARY) {
+                    $xmldb_field->getType() != XMLDB_TYPE_BINARY && !$xmldb_field->getNotNull()) {
                     $default = ' DEFAULT ' . $this->drop_default_clause;
                 }
             }