From 2532091ae86ce95f31bdacdeaa799704c02d9063 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 1 Jan 2011 16:59:10 +0000
Subject: [PATCH] PDO DSN handling (PS. PHP is retarded)

---
 core/database.class.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/core/database.class.php b/core/database.class.php
index 0d4e3927..27603f93 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -273,12 +273,22 @@ class Database {
 	public function Database() {
 		global $database_dsn, $cache_dsn;
 
-		# FIXME: translate database URI into something PDO compatible
-		include "config.php";
-		#$db_proto = $database_dsn;
-		#$db_host  = $database_dsn;
-		#$db_name  = $database_dsn;
+		# FIXME: detect ADODB URI, automatically translate PDO DSN
 
+		/*
+		 * Why does the abstraction layer act differently depending on the
+		 * back-end? Because PHP is deliberately retarded.
+		 *
+		 * http://stackoverflow.com/questions/237367
+		 */
+		$matches = array(); $db_user=null; $db_pass=null;
+		if(preg_match("/user=([^;]*)/", $database_dsn, $matches)) $db_user=$matches[1];
+		if(preg_match("/password=([^;]*)/", $database_dsn, $matches)) $db_pass=$matches[1];
+
+		$this->db = new PDO($database_dsn, $db_user, $db_pass);
+		$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+		$db_proto = $this->db->getAttribute(PDO::ATTR_DRIVER_NAME);
 		if($db_proto == "mysql") {
 			$this->engine = new MySQL();
 		}
@@ -288,9 +298,9 @@ class Database {
 		else if($db_proto == "sqlite") {
 			$this->engine = new SQLite();
 		}
-
-		$this->db = new PDO("$db_proto:host=$db_host;dbname=$db_name", $db_user, $db_pass);
-		$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		else {
+			die("Unknown PDO driver: $db_proto");
+		}
 
 		if(isset($cache_dsn) && !empty($cache_dsn)) {
 			$matches = array();