Merge remote-tracking branch 'rafi/master' into rafi

1 files changed, 18 insertions, 8 deletions

diff --git a/application/migrations/006_add_username_index.php b/application/migrations/006_add_username_index.php
index ea5e3ebc0..5b8c3584f 100644
--- a/application/migrations/006_add_username_index.php
+++ b/application/migrations/006_add_username_index.php
@@ -5,17 +5,27 @@ class Migration_Add_username_index extends CI_Migration {
 
 	public function up()
 	{
-		$this->db->query("
-			ALTER TABLE `users`
-			ADD UNIQUE `username` (`username`);
-		");
+		if ($this->db->dbdriver == 'postgre') {
+			$this->db->query('
+				CREATE UNIQUE INDEX "users_username_idx" ON "users" ("username")
+			');
+		} else {
+			$this->db->query("
+				ALTER TABLE `users`
+				ADD UNIQUE `username` (`username`);
+			");
+		}
 	}
 
 	public function down()
 	{
-		$this->db->query("
-			ALTER TABLE `users`
-			DROP INDEX `username`;
-		");
+		if ($this->db->dbdriver == 'postgre') {
+			$this->db->query('DROP INDEX "users_username_idx"');
+		} else {
+			$this->db->query("
+				ALTER TABLE `users`
+				DROP INDEX `username`;
+			");
+		}
 	}
 }