Merge branch 'api-rework' into working

1 files changed, 7 insertions, 5 deletions

diff --git a/application/migrations/009_add_apikeys.php b/application/migrations/009_add_apikeys.php
index 8f2882e49..a5af809fc 100644
--- a/application/migrations/009_add_apikeys.php
+++ b/application/migrations/009_add_apikeys.php
@@ -5,22 +5,24 @@ class Migration_Add_apikeys extends CI_Migration {
 
 	public function up()
 	{
+		$prefix = $this->db->dbprefix;
+
 		if ($this->db->dbdriver == 'postgre') {
 			$this->db->query('
-				CREATE TABLE "apikeys" (
+				CREATE TABLE "'.$prefix.'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");
+				CREATE INDEX "apikeys_user_idx" ON "'.$prefix.'apikeys" ("user");
 			');
 
 		} else {
 
-			$this->db->query("
-				CREATE TABLE `apikeys` (
+			$this->db->query('
+				CREATE TABLE `'.$prefix.'apikeys` (
 					`key` varchar(64) COLLATE utf8_bin NOT NULL,
 					`user` int(8) unsigned NOT NULL,
 					`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -28,7 +30,7 @@ class Migration_Add_apikeys extends CI_Migration {
 					PRIMARY KEY (`key`),
 					KEY `user` (`user`)
 				) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin
-			");
+			');
 		}
 	}