made MySQL/MySQLi forge use explicitly named KEYs, added ability to specify multi-column non-primary keys in table creation

8 files changed, 95 insertions, 27 deletions

diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php
index ddd1bb6ae..6995d3422 100644
--- a/system/database/drivers/mssql/mssql_forge.php
+++ b/system/database/drivers/mssql/mssql_forge.php
@@ -147,16 +147,24 @@ class CI_DB_mssql_forge extends CI_DB_forge {
 			$primary_keys = $this->db->_protect_identifiers($primary_keys);

 			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";

 		}

-

+		

 		if (is_array($keys) && count($keys) > 0)

 		{

-			$keys = $this->db->_protect_identifiers($keys);

 			foreach ($keys as $key)

 			{

-				$sql .= ",\n\tFOREIGN KEY ($key)";

+				if (is_array($key))

+				{

+					$key = $this->db->_protect_identifiers($key);	

+				}

+				else

+				{

+					$key = array($this->db->_protect_identifiers($key));

+				}

+				

+				$sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")";

 			}

 		}

-

+		

 		$sql .= "\n)";

 

 		return $sql;

diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php
index a631e4301..28143a04d 100644
--- a/system/database/drivers/mysql/mysql_forge.php
+++ b/system/database/drivers/mysql/mysql_forge.php
@@ -153,16 +153,27 @@ class CI_DB_mysql_forge extends CI_DB_forge {
 

 		if (count($primary_keys) > 0)

 		{

+			$key_name = $this->db->_protect_identifiers(implode('_', $primary_keys));

 			$primary_keys = $this->db->_protect_identifiers($primary_keys);

-			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";

+			$sql .= ",\n\tPRIMARY KEY ".$key_name." (" . implode(', ', $primary_keys) . ")";

 		}

 

 		if (is_array($keys) && count($keys) > 0)

 		{

-			$keys = $this->db->_protect_identifiers($keys);

 			foreach ($keys as $key)

 			{

-				$sql .= ",\n\tKEY ($key)";

+				if (is_array($key))

+				{

+					$key_name = $this->db->_protect_identifiers(implode('_', $key));

+					$key = $this->db->_protect_identifiers($key);	

+				}

+				else

+				{

+					$key_name = $this->db->_protect_identifiers($key);

+					$key = array($key_name);

+				}

+				

+				$sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")";

 			}

 		}

 

diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php
index f767acbea..da79bc6ac 100644
--- a/system/database/drivers/mysqli/mysqli_forge.php
+++ b/system/database/drivers/mysqli/mysqli_forge.php
@@ -153,16 +153,27 @@ class CI_DB_mysqli_forge extends CI_DB_forge {
 

 		if (count($primary_keys) > 0)

 		{

+			$key_name = $this->db->_protect_identifiers(implode('_', $primary_keys));

 			$primary_keys = $this->db->_protect_identifiers($primary_keys);

-			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";

+			$sql .= ",\n\tPRIMARY KEY ".$key_name." (" . implode(', ', $primary_keys) . ")";

 		}

 

 		if (is_array($keys) && count($keys) > 0)

 		{

-			$keys = $this->db->_protect_identifiers($keys);

 			foreach ($keys as $key)

 			{

-				$sql .= ",\n\tKEY ($key)";

+				if (is_array($key))

+				{

+					$key_name = $this->db->_protect_identifiers(implode('_', $key));

+					$key = $this->db->_protect_identifiers($key);	

+				}

+				else

+				{

+					$key_name = $this->db->_protect_identifiers($key);

+					$key = array($key_name);

+				}

+				

+				$sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")";

 			}

 		}

 

diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php
index 9f3fac54f..6266c75a3 100644
--- a/system/database/drivers/oci8/oci8_forge.php
+++ b/system/database/drivers/oci8/oci8_forge.php
@@ -135,10 +135,21 @@ class CI_DB_oci8_forge extends CI_DB_forge {
 			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";

 		}

 

-		if (count($keys) > 0)

+		if (is_array($keys) && count($keys) > 0)

 		{

-			$keys = $this->db->_protect_identifiers($keys);

-			$sql .= ",\n\tUNIQUE COLUMNS (" . implode(', ', $keys) . ")";

+			foreach ($keys as $key)

+			{

+				if (is_array($key))

+				{

+					$key = $this->db->_protect_identifiers($key);	

+				}

+				else

+				{

+					$key = array($this->db->_protect_identifiers($key));

+				}

+				

+				$sql .= ",\n\tUNIQUE COLUMNS (" . implode(', ', $key) . ")";

+			}

 		}

 		

 		$sql .= "\n)";

diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php
index 60df616c3..10924abe2 100644
--- a/system/database/drivers/odbc/odbc_forge.php
+++ b/system/database/drivers/odbc/odbc_forge.php
@@ -146,16 +146,24 @@ class CI_DB_odbc_forge extends CI_DB_forge {
 			$primary_keys = $this->db->_protect_identifiers($primary_keys);

 			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";

 		}

-

+		

 		if (is_array($keys) && count($keys) > 0)

 		{

-			$keys = $this->db->_protect_identifiers($keys);

 			foreach ($keys as $key)

 			{

-				$sql .= ",\n\tFOREIGN KEY ($key)";

+				if (is_array($key))

+				{

+					$key = $this->db->_protect_identifiers($key);	

+				}

+				else

+				{

+					$key = array($this->db->_protect_identifiers($key));

+				}

+				

+				$sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")";

 			}

 		}

-

+		

 		$sql .= "\n)";

 

 		return $sql;

diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php
index f8dfca8a1..ef5783451 100644
--- a/system/database/drivers/postgre/postgre_forge.php
+++ b/system/database/drivers/postgre/postgre_forge.php
@@ -134,13 +134,21 @@ class CI_DB_postgre_forge extends CI_DB_forge {
 			$primary_keys = $this->db->_protect_identifiers($primary_keys);

 			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";

 		}

-

+		

 		if (is_array($keys) && count($keys) > 0)

 		{

-			$keys = $this->db->_protect_identifiers($keys);

 			foreach ($keys as $key)

 			{

-				$sql .= ",\n\tFOREIGN KEY ($key)";

+				if (is_array($key))

+				{

+					$key = $this->db->_protect_identifiers($key);	

+				}

+				else

+				{

+					$key = array($this->db->_protect_identifiers($key));

+				}

+				

+				$sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")";

 			}

 		}

 

diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php
index 25c74a731..a6866c877 100644
--- a/system/database/drivers/sqlite/sqlite_forge.php
+++ b/system/database/drivers/sqlite/sqlite_forge.php
@@ -144,13 +144,24 @@ class CI_DB_sqlite_forge extends CI_DB_forge {
 			$primary_keys = $this->db->_protect_identifiers($primary_keys);

 			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";

 		}

-

-		if (count($keys) > 0)

+		

+		if (is_array($keys) && count($keys) > 0)

 		{

-			$keys = $this->db->_protect_identifiers($keys);

-			$sql .= ",\n\tUNIQUE (" . implode(', ', $keys) . ")";

+			foreach ($keys as $key)

+			{

+				if (is_array($key))

+				{

+					$key = $this->db->_protect_identifiers($key);	

+				}

+				else

+				{

+					$key = array($this->db->_protect_identifiers($key));

+				}

+				

+				$sql .= ",\n\tUNIQUE (" . implode(', ', $key) . ")";

+			}

 		}

-

+		

 		$sql .= "\n)";

 

 		return $sql;

diff --git a/system/plugins/captcha_pi.php b/system/plugins/captcha_pi.php
index df95788ee..baa0a8dc5 100644
--- a/system/plugins/captcha_pi.php
+++ b/system/plugins/captcha_pi.php
@@ -92,8 +92,8 @@ Here is a table prototype:
 	 captcha_time int(10) unsigned NOT NULL,

 	 ip_address varchar(16) default '0' NOT NULL,

 	 word varchar(20) NOT NULL,

-	 PRIMARY KEY (captcha_id),

-	 KEY (word)

+	 PRIMARY KEY `captcha_id` (`captcha_id`),

+	 KEY `word` (`word`)

 	)