From 114ab0988e20ac6be39ad363ff897a1a3b85e565 Mon Sep 17 00:00:00 2001
From: Razican <devnull@localhost>
Date: Mon, 25 Apr 2011 17:26:45 +0200
Subject: Fixed double-space typo.

---
 system/database/drivers/mysqli/mysqli_forge.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/database/drivers/mysqli/mysqli_forge.php')

diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php
index d5097335e..6450968dd 100644
--- a/system/database/drivers/mysqli/mysqli_forge.php
+++ b/system/database/drivers/mysqli/mysqli_forge.php
@@ -1,4 +1,4 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -86,7 +86,7 @@ class CI_DB_mysqli_forge extends CI_DB_forge {
 
 				if (array_key_exists('TYPE', $attributes))
 				{
-					$sql .=  ' '.$attributes['TYPE'];
+					$sql .= ' '.$attributes['TYPE'];
 				}
 
 				if (array_key_exists('CONSTRAINT', $attributes))
-- 
cgit v1.2.3-24-g4f1b


From 4b9c62980599228f070b401c7673dce8085b0c61 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:40:48 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 system/database/drivers/mysqli/mysqli_forge.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/database/drivers/mysqli/mysqli_forge.php')

diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php
index 6450968dd..d5097335e 100644
--- a/system/database/drivers/mysqli/mysqli_forge.php
+++ b/system/database/drivers/mysqli/mysqli_forge.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -86,7 +86,7 @@ class CI_DB_mysqli_forge extends CI_DB_forge {
 
 				if (array_key_exists('TYPE', $attributes))
 				{
-					$sql .= ' '.$attributes['TYPE'];
+					$sql .=  ' '.$attributes['TYPE'];
 				}
 
 				if (array_key_exists('CONSTRAINT', $attributes))
-- 
cgit v1.2.3-24-g4f1b


From c5961e7d778d5a9361df4cfbc7da5fc4370d883f Mon Sep 17 00:00:00 2001
From: Adam Jackett <adam@darkhousemedia.com>
Date: Sat, 23 Jul 2011 09:50:34 -0400
Subject: Fixed mysql and mysqli drivers to set NOT NULL as default for
 creating fields. All other drivers were correct.

---
 system/database/drivers/mysqli/mysqli_forge.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'system/database/drivers/mysqli/mysqli_forge.php')

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)
-- 
cgit v1.2.3-24-g4f1b