diff options
| author | Pascal Kriete <pascal@pascalkriete.com> | 2011-08-12 18:54:13 +0200 |
|---|---|---|
| committer | Pascal Kriete <pascal@pascalkriete.com> | 2011-08-12 18:54:13 +0200 |
| commit | c4f024641ab69ed9cce62a2864e47e060b81048b (patch) | |
| tree | a4de86c0c6e95e6042ce66e84bdcd0c18c51d643 /system/database/drivers/mysqli/mysqli_forge.php | |
| parent | abccc2fa65eea5f64773952661a8ba79e559333b (diff) | |
| parent | b0eae5f81a4cb92911bb215ad814ae5caef4f61d (diff) | |
Merging - fingers crossed
Conflicts:
system/database/drivers/mysql/mysql_driver.php
system/database/drivers/mysqli/mysqli_driver.php
system/libraries/Email.php
user_guide/changelog.html
user_guide/database/configuration.html
user_guide/helpers/url_helper.html
user_guide/libraries/cart.html
user_guide/libraries/form_validation.html
Diffstat (limited to 'system/database/drivers/mysqli/mysqli_forge.php')
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_forge.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index d5097335e..260549457 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -104,9 +104,13 @@ class CI_DB_mysqli_forge extends CI_DB_forge { $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; } - if (array_key_exists('NULL', $attributes)) + if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) { - $sql .= ($attributes['NULL'] === TRUE) ? ' NULL' : ' NOT NULL'; + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; } if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) |