diff options
| author | Andrey Andreev <narf@devilix.net> | 2019-01-08 16:55:37 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2019-01-08 16:55:37 +0100 |
| commit | 7ec458b45316b9f270e1e03de498244f71c605ea (patch) | |
| tree | a110bf9c71b49a69beec49d1874f423375cd0fd1 /system/database/DB_forge.php | |
| parent | 67563c64025085e61598a83fef3e25bef38b32c4 (diff) | |
| parent | 12ee9843877bf80159d1d89a0e3a4f170e902725 (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
system/database/drivers/sqlite/sqlite_driver.php
system/database/drivers/sqlite/sqlite_forge.php
system/database/drivers/sqlite/sqlite_result.php
system/database/drivers/sqlite/sqlite_utility.php
system/helpers/captcha_helper.php
system/helpers/email_helper.php
system/helpers/inflector_helper.php
system/helpers/smiley_helper.php
system/language/english/form_validation_lang.php
system/libraries/Cart.php
system/libraries/Form_validation.php
system/libraries/Javascript.php
system/libraries/Javascript/Jquery.php
system/libraries/Session/SessionHandlerInterface.php
tests/codeigniter/helpers/inflector_helper_test.php
user_guide_src/source/helpers/inflector_helper.rst
Diffstat (limited to 'system/database/DB_forge.php')
| -rw-r--r-- | system/database/DB_forge.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index dfc8a41b6..b086f7a81 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -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' => '', |