db updates, remove init_connection()

4 files changed, 24 insertions, 0 deletions

diff --git a/classes/db.php b/classes/db.php
index 403cbc93a..71fc01ae1 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -16,6 +16,7 @@ class Db implements IDb {
 		}
 
 		$this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT);
+		$this->adapter->init();
 	}
 
 	private function __clone() {
@@ -33,6 +34,10 @@ class Db implements IDb {
 		return("'$str'");
 	}
 
+	function init() {
+		//
+	}
+
 	function connect($host, $user, $pass, $db, $port) {
 		//return $this->adapter->connect($host, $user, $pass, $db, $port);
 	}
diff --git a/classes/db/mysql.php b/classes/db/mysql.php
index 512ea3894..fa97dcff1 100644
--- a/classes/db/mysql.php
+++ b/classes/db/mysql.php
@@ -55,5 +55,15 @@ class Db_Mysql implements IDb {
 		return mysql_affected_rows($this->link);
 	}
 
+	function init() {
+		$this->query("SET time_zone = '+0:0'");
+
+		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+			$this->query("SET NAMES " . MYSQL_CHARSET);
+		}
+
+		return true;
+	}
+
 }
 ?>
diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index 87c2abefd..c9ec33887 100644
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -69,5 +69,13 @@ class Db_Pgsql implements IDb {
 		return pg_last_error($this->link);
 	}
 
+	function init() {
+		$this->query("set client_encoding = 'UTF-8'");
+		pg_set_client_encoding("UNICODE");
+		$this->query("set datestyle = 'ISO, european'");
+		$this->query("set TIME ZONE 0");
+
+		return true;
+	}
 }
 ?>
diff --git a/classes/idb.php b/classes/idb.php
index 16f760bf6..1ca6925b4 100644
--- a/classes/idb.php
+++ b/classes/idb.php
@@ -1,6 +1,7 @@
 <?php
 interface IDb {
 	function connect($host, $user, $pass, $db, $port);
+	function init();
 	function escape_string($s, $strip_tags = true);
 	function query($query, $die_on_error = true);
 	function fetch_assoc($result);