Fix bcit-ci#4173

narfbg · narfbg · commit 95f815745855 · 2015-10-19T13:16:19.000+03:00
This reverts commit 7cc6cea from PR bcit-ci#3968. At the time this seemed logical, but turns out it breaks the ability to create non-PRIMARY composite keys, so ...
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
@@ -239,7 +239,13 @@ public function drop_database($db_name)
 	 */
 	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)
 			{
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
@@ -16,6 +16,7 @@ Bug fixes for 3.0.3
 
 -  Fixed a bug (#4170) - :doc:`Database <database/index>` method ``insert_id()`` could return an identity from the wrong scope with the 'sqlsrv' driver.
 -  Fixed a bug (#4179) - :doc:`Session Library <libraries/sessions>` doesn't properly maintain its state after ID regeneration with the 'database' driver on PHP7.
+-  Fixed a bug (#4173) - :doc:`Database Forge <database/forge>` method ``add_key()`` didn't allow creation of non-PRIMARY composite keys after the "bugfix" for #3968.
 
 Version 3.0.2
 =============

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,13 @@ public function drop_database($db_name)`
`239`	`239`	`*/`
`240`	`240`	`public function add_key($key, $primary = FALSE)`
`241`	`241`	`{`
`242`		`- if (is_array($key))`
	`242`	`+ // DO NOT change this! This condition is only applicable`
	`243`	`+ // for PRIMARY keys because you can only have one such,`
	`244`	`+ // and therefore all fields you add to it will be included`
	`245`	`+ // in the same, composite PRIMARY KEY.`
	`246`	`+ //`
	`247`	`+ // It's not the same for regular indexes.`
	`248`	`+ if ($primary === TRUE && is_array($key))`
`243`	`249`	`{`
`244`	`250`	`foreach ($key as $one)`
`245`	`251`	`{`