Merge branch 'pgsql_migrations'

* pgsql_migrations:
  Optimizing multipaste tables
  apikeys.created should be timestamp with default now()
  No column based encoding. Reverting dbforge migration
  Correcting bracket style for 'if'
  Migrations support for PostgreSQL

1 files changed, 42 insertions, 16 deletions

diff --git a/application/migrations/008_add_profiles.php b/application/migrations/008_add_profiles.php
index 3fea33c08..9958fb03e 100644
--- a/application/migrations/008_add_profiles.php
+++ b/application/migrations/008_add_profiles.php
@@ -5,27 +5,53 @@ class Migration_Add_profiles extends CI_Migration {
 
 	public function up()
 	{
-		$this->db->query("
-			CREATE TABLE `profiles` (
-				`user` int(8) unsigned NOT NULL,
-				`upload_id_limits` varchar(255) COLLATE utf8_bin NOT NULL,
-				PRIMARY KEY (`user`)
-			) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin
-			");
+		if ($this->db->dbdriver == 'postgre') {
+			$this->db->query('
+				CREATE TABLE "profiles" (
+					"user" integer NOT NULL,
+					"upload_id_limits" varchar(255) NOT NULL,
+					PRIMARY KEY ("user")
+				)
+			');
+
+			$this->db->query('
+				ALTER TABLE "files" ALTER COLUMN "id" TYPE varchar(255);
+			');
 
-		$this->db->query("
-			ALTER TABLE `files` CHANGE `id` `id` VARCHAR( 255 );
-		");
+		} else {
 
+			$this->db->query("
+				CREATE TABLE `profiles` (
+					`user` int(8) unsigned NOT NULL,
+					`upload_id_limits` varchar(255) COLLATE utf8_bin NOT NULL,
+					PRIMARY KEY (`user`)
+				) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin
+				");
+
+			$this->db->query("
+				ALTER TABLE `files` CHANGE `id` `id` VARCHAR( 255 );
+			");
+		}
 	}
 
 	public function down()
 	{
-		$this->db->query("
-			DROP TABLE `profiles`;
-		");
-		$this->db->query("
-			ALTER TABLE `files` CHANGE `id` `id` VARCHAR( 6 );
-		");
+		if ($this->db->dbdriver == 'postgre') {
+			$this->db->query('
+				DROP TABLE "profiles";
+			');
+			$this->db->query('
+				ALTER TABLE "files" ALTER COLUMN "id" TYPE varchar(6);
+			');
+
+		} else {
+
+			$this->db->query("
+				DROP TABLE `profiles`;
+			");
+			$this->db->query("
+				ALTER TABLE `files` CHANGE `id` `id` VARCHAR( 6 );
+			");
+		}
 	}
 }