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

1 files changed, 25 insertions, 10 deletions

diff --git a/application/migrations/009_add_apikeys.php b/application/migrations/009_add_apikeys.php
index 8e88260a8..8f2882e49 100644
--- a/application/migrations/009_add_apikeys.php
+++ b/application/migrations/009_add_apikeys.php
@@ -5,16 +5,31 @@ class Migration_Add_apikeys extends CI_Migration {
 
 	public function up()
 	{
-		$this->db->query("
-			CREATE TABLE `apikeys` (
-				`key` varchar(64) COLLATE utf8_bin NOT NULL,
-				`user` int(8) unsigned NOT NULL,
-				`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-				`comment` varchar(255) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
-				PRIMARY KEY (`key`),
-				KEY `user` (`user`)
-			) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin
-		");
+		if ($this->db->dbdriver == 'postgre') {
+			$this->db->query('
+				CREATE TABLE "apikeys" (
+					"key" varchar(64) NOT NULL,
+					"user" integer NOT NULL,
+					"created" timestamp WITH TIME ZONE NOT NULL DEFAULT NOW(),
+					"comment" varchar(255) NOT NULL,
+					PRIMARY KEY ("key")
+				);
+				CREATE INDEX "apikeys_user_idx" ON "apikeys" ("user");
+			');
+
+		} else {
+
+			$this->db->query("
+				CREATE TABLE `apikeys` (
+					`key` varchar(64) COLLATE utf8_bin NOT NULL,
+					`user` int(8) unsigned NOT NULL,
+					`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+					`comment` varchar(255) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+					PRIMARY KEY (`key`),
+					KEY `user` (`user`)
+				) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin
+			");
+		}
 	}
 
 	public function down()