diff options
author | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
commit | 9f52b09abe8dd2919cf9b5d22d12abb0203eb8a8 (patch) | |
tree | fd94ba9616ccc4cfbdb3ecfddece0ce2fa1bba24 /system/database/drivers/mysqli/mysqli_forge.php | |
parent | caec47b75d132b98a1b251448a46d3756d05c7b8 (diff) | |
parent | c09370bebb08082ab0655a964a6e6e1331ed47fb (diff) |
Merge branch 'working'
Diffstat (limited to 'system/database/drivers/mysqli/mysqli_forge.php')
-rwxr-xr-x | 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 100755 --- 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) |