diff options
| author | Steffen Stollfuß <j0inty@users.noreply.github.com> | 2015-11-08 20:05:31 +0100 |
|---|---|---|
| committer | Steffen Stollfuß <j0inty@users.noreply.github.com> | 2015-11-08 20:05:31 +0100 |
| commit | 49c78f694eded442d95a25feb5bbc69e6bffb205 (patch) | |
| tree | ae36e42478e17f3d016bb3bd3b86aba0e9f16ca3 /system/database/DB_forge.php | |
| parent | 81a6f81d88a0cded9fa5617c4bc578311c5bb652 (diff) | |
| parent | 6c4daef7ace73e1e9bacb511f646ade778763ff9 (diff) | |
Merge pull request #1 from bcit-ci/develop
Pull current develop branch to submit a bug report later
Diffstat (limited to 'system/database/DB_forge.php')
| -rw-r--r-- | system/database/DB_forge.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index dde285598..f9cf76a14 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -239,7 +239,13 @@ abstract class CI_DB_forge { */ public function add_key($key, $primary = FALSE) { - if (is_array($key)) + // DO NOT change this! This condition is only applicable + // for PRIMARY keys because you can only have one such, + // and therefore all fields you add to it will be included + // in the same, composite PRIMARY KEY. + // + // It's not the same for regular indexes. + if ($primary === TRUE && is_array($key)) { foreach ($key as $one) { |