Merge remote-tracking branch 'bantu/ticket/11547' into develop-olympus

bantu · bantu · commit 37a334c187e3 · 2013-05-17T02:27:12.000+02:00
* bantu/ticket/11547:
  [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -142,6 +142,14 @@ public function connect($use_db = true)
 		}
 
 		$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+		switch ($this->config['dbms'])
+		{
+			case 'mysql':
+			case 'mysqli':
+				$this->pdo->exec('SET NAMES utf8');
+			default:
+		}
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,14 @@ public function connect($use_db = true)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);`
	`145`	`+`
	`146`	`+ switch ($this->config['dbms'])`
	`147`	`+ {`
	`148`	`+ case 'mysql':`
	`149`	`+ case 'mysqli':`
	`150`	`+ $this->pdo->exec('SET NAMES utf8');`
	`151`	`+ default:`
	`152`	`+ }`
`145`	`153`	`}`
`146`	`154`
`147`	`155`	`/**`