diff options
| author | Florian Pritz <bluewind@xinu.at> | 2019-01-28 15:54:04 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2019-01-28 15:54:04 +0100 |
| commit | b4841bc83374052c46fbc3f4a223484199546fd8 (patch) | |
| tree | 385733a716c03b576335e5bb98361c13e92138f3 /system/database/DB_forge.php | |
| parent | 98f7c65dddf0667f1a0462e08be9e6273ce658fb (diff) | |
| parent | c576995304fc3609cca0b7b92d1b2cd611ec82f5 (diff) | |
Merge tag '3.1.10' of git://github.com/bcit-ci/CodeIgniter into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/database/DB_forge.php')
| -rw-r--r-- | system/database/DB_forge.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index d3057dc1c..85b58fdeb 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -6,7 +6,7 @@ * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014 - 2018, British Columbia Institute of Technology + * Copyright (c) 2014 - 2019, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,8 +29,8 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) - * @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/) - * @license http://opensource.org/licenses/MIT MIT License + * @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License * @link https://codeigniter.com * @since Version 1.0.0 * @filesource @@ -348,7 +348,10 @@ abstract class CI_DB_forge { if (($result = $this->db->query($sql)) !== FALSE) { - isset($this->db->data_cache['table_names']) && $this->db->data_cache['table_names'][] = $table; + if (isset($this->db->data_cache['table_names'])) + { + $this->db->data_cache['table_names'][] = $table; + } // Most databases don't support creating indexes from within the CREATE TABLE statement if ( ! empty($this->keys)) @@ -724,7 +727,7 @@ abstract class CI_DB_forge { 'type' => isset($attributes['TYPE']) ? $attributes['TYPE'] : NULL, 'length' => '', 'unsigned' => '', - 'null' => '', + 'null' => NULL, 'unique' => '', 'default' => '', 'auto_increment' => '', |