2 files changed, 55 insertions, 6 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 8b089a060f..8bc63e564a 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -767,4 +767,28 @@ class migrator
 
 		return $this->migrations;
 	}
+
+	/**
+	* Creates the migrations table if it does not exist.
+	* @return null
+	*/
+	public function create_migrations_table()
+	{
+		// Make sure migrations have been installed.
+		if (!$this->db_tools->sql_table_exists($this->table_prefix . 'migrations'))
+		{
+			$this->db_tools->sql_create_table($this->table_prefix . 'migrations', array(
+				'COLUMNS'		=> array(
+					'migration_name'			=> array('VCHAR', ''),
+					'migration_depends_on'		=> array('TEXT', ''),
+					'migration_schema_done'		=> array('BOOL', 0),
+					'migration_data_done'		=> array('BOOL', 0),
+					'migration_data_state'		=> array('TEXT', ''),
+					'migration_start_time'		=> array('TIMESTAMP', 0),
+					'migration_end_time'		=> array('TIMESTAMP', 0),
+				),
+				'PRIMARY_KEY'	=> 'migration_name',
+			));
+		}
+	}
 }
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 18defc4535..ae0c695aa2 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -1487,8 +1487,16 @@ class tools
 
 				$return_array['textimage'] = $column_type === '[text]';
 
-				$sql .= 'NOT NULL';
-				$sql_default .= 'NOT NULL';
+				if (!is_null($column_data[1]) || (isset($column_data[2]) && $column_data[2] == 'auto_increment'))
+				{
+					$sql .= 'NOT NULL';
+					$sql_default .= 'NOT NULL';
+				}
+				else
+				{
+					$sql .= 'NULL';
+					$sql_default .= 'NULL';
+				}
 
 				$return_array['column_type_sql_default'] = $sql_default;
 
@@ -1503,7 +1511,15 @@ class tools
 				{
 					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
 				}
-				$sql .= 'NOT NULL';
+
+				if (!is_null($column_data[1]))
+				{
+					$sql .= 'NOT NULL';
+				}
+				else
+				{
+					$sql .= 'NULL';
+				}
 
 				if (isset($column_data[2]))
 				{
@@ -1528,7 +1544,7 @@ class tools
 				// Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields)
 				if (!preg_match('/number/i', $column_type))
 				{
-					$sql .= ($column_data[1] === '') ? '' : 'NOT NULL';
+					$sql .= ($column_data[1] === '' || $column_data[1] === null) ? '' : 'NOT NULL';
 				}
 
 				$return_array['auto_increment'] = false;
@@ -1556,6 +1572,12 @@ class tools
 					$return_array['null'] = 'NOT NULL';
 					$sql .= 'NOT NULL ';
 				}
+				else
+				{
+					$default_val = "'" . $column_data[1] . "'";
+					$return_array['null'] = 'NULL';
+					$sql .= 'NULL ';
+				}
 
 				$return_array['default'] = $default_val;
 
@@ -1588,8 +1610,11 @@ class tools
 					$sql .= ' ' . $column_type;
 				}
 
-				$sql .= ' NOT NULL ';
-				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
+				if (!is_null($column_data[1]))
+				{
+					$sql .= ' NOT NULL ';
+					$sql .= "DEFAULT '{$column_data[1]}'";
+				}
 
 			break;
 		}