diff options
| author | Adam Jackett <adam@darkhousemedia.com> | 2011-07-23 15:50:34 +0200 |
|---|---|---|
| committer | Adam Jackett <adam@darkhousemedia.com> | 2011-07-23 15:50:34 +0200 |
| commit | 242c258f2bf027e7c13b448131bd7e94bde81027 (patch) | |
| tree | 5fa887893cb30d0c1a02bc62744bac0b71d0615c | |
| parent | 8731f641de823fcdcb8b2a2fa6034fca8fe4a164 (diff) | |
Fixed mysql and mysqli drivers to set NOT NULL as default for creating fields. All other drivers were correct.
| -rw-r--r-- | system/database/drivers/mysql/mysql_forge.php | 8 | ||||
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_forge.php | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index 529ec980d..c1cae136c 100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php @@ -119,9 +119,13 @@ class CI_DB_mysql_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) 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) |