diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-11-04 14:43:11 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-11-04 14:43:11 +0100 |
| commit | 66a8940823b8ce9cd9e0bfe5d4263008a437a422 (patch) | |
| tree | 0d02a82cce7adfbfeee51e2a4a7257c74f906551 /system/database/DB_forge.php | |
| parent | 175b17c4b74d03a7578440d92a3ac9d80924ef78 (diff) | |
| parent | ab3c383fb3535e55253271f210870cd9361d94c9 (diff) | |
Merge branch '3.0-stable' into develop
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) { |