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

1 files changed, 49 insertions, 21 deletions

diff --git a/application/migrations/007_repurpose_invitations.php b/application/migrations/007_repurpose_invitations.php
index d586c2829..024b62984 100644
--- a/application/migrations/007_repurpose_invitations.php
+++ b/application/migrations/007_repurpose_invitations.php
@@ -5,33 +5,61 @@ class Migration_Repurpose_invitations extends CI_Migration {
 
 	public function up()
 	{
-		$this->db->query("
-			ALTER TABLE `invitations`
-				ADD `action` VARCHAR(255) NOT NULL,
-				ADD `data` TEXT NULL,
-				ADD INDEX `action` (`action`);
-		");
+		if ($this->db->dbdriver == 'postgre') {
+			$this->db->query('
+				ALTER TABLE "invitations"
+					ADD "action" character varying(255) NOT NULL,
+					ADD "data" TEXT NULL;
+				CREATE INDEX "invitations_action_idx" ON invitations ("action");
+			');
 
-		$this->db->query("
-			UPDATE `invitations` SET `action` = 'invitation' WHERE `action` = '';
-		");
+			$this->db->query('
+				UPDATE "invitations" SET "action" = \'invitation\' WHERE "action" = \'\'
+			');
 
-		$this->db->query("
-			ALTER TABLE `invitations` RENAME `actions`;
-		");
+			$this->db->query('
+				ALTER TABLE "invitations" RENAME TO "actions";
+			');
 
+		} else {
+
+			$this->db->query("
+				ALTER TABLE `invitations`
+					ADD `action` VARCHAR(255) NOT NULL,
+					ADD `data` TEXT NULL,
+					ADD INDEX `action` (`action`);
+			");
+
+			$this->db->query("
+				UPDATE `invitations` SET `action` = 'invitation' WHERE `action` = '';
+			");
+
+			$this->db->query("
+				ALTER TABLE `invitations` RENAME `actions`;
+			");
+		}
 	}
 
 	public function down()
 	{
-		$this->db->query("
-			ALTER TABLE `actions` RENAME `invitations`;
-		");
-
-		$this->db->query("
-			ALTER TABLE `invitations`
-				DROP `action`,
-				DROP `data`;
-		");
+		if ($this->db->dbdriver == 'postgre')
+		{
+			$this->db->query('ALTER TABLE "actions" RENAME TO "invitations"');
+			$this->db->query('
+				ALTER TABLE "invitations"
+					DROP "action",
+					DROP "data";
+			');
+
+		} else {
+
+			$this->db->query('ALTER TABLE `actions` RENAME `invitations`');
+			$this->db->query('
+				ALTER TABLE `invitations`
+					DROP `action`,
+					DROP `data`;
+			');
+		}
+
 	}
 }