Update BaseUnitTest.php

jcheron · jcheron · commit 74e44a9a46ab · 2019-07-30T15:21:24.000+02:00
Fix for multi-db
diff --git a/src/unit/BaseUnitTest.php b/src/unit/BaseUnitTest.php
@@ -55,10 +55,10 @@ protected function _startRouter($what = false) {
 		}
 	}
 
-	protected function _startDatabase(DAO $dao) {
-		$db = $this->config ["database"] ?? [ ];
+	protected function _startDatabase(DAO $dao, $dbOffset = 'default') {
+		$db = DAO::getDbOffset ( $this->config, $dbOffset );
 		if ($db ["dbName"] !== "") {
-			$dao->connect ( $db ["type"]??'mysql', $db ["dbName"], $db ["serverName"] ?? '127.0.0.1', $db ["port"] ?? 3306, $db ["user"] ?? 'root', $db ["password"] ?? '', $db ["options"] ?? [ ], $db ["cache"] ?? false);
+			$dao->connect ( $dbOffset, $db ["type"] ?? 'mysql', $db ["dbName"], $db ["serverName"] ?? '127.0.0.1', $db ["port"] ?? 3306, $db ["user"] ?? 'root', $db ["password"] ?? '', $db ["options"] ?? [ ], $db ["cache"] ?? false);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,10 @@ protected function _startRouter($what = false) {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- protected function _startDatabase(DAO $dao) {`
`59`		`- $db = $this->config ["database"] ?? [ ];`
	`58`	`+ protected function _startDatabase(DAO $dao, $dbOffset = 'default') {`
	`59`	`+ $db = DAO::getDbOffset ( $this->config, $dbOffset );`
`60`	`60`	`if ($db ["dbName"] !== "") {`
`61`		`- $dao->connect ( $db ["type"]??'mysql', $db ["dbName"], $db ["serverName"] ?? '127.0.0.1', $db ["port"] ?? 3306, $db ["user"] ?? 'root', $db ["password"] ?? '', $db ["options"] ?? [ ], $db ["cache"] ?? false);`
	`61`	`+ $dao->connect ( $dbOffset, $db ["type"] ?? 'mysql', $db ["dbName"], $db ["serverName"] ?? '127.0.0.1', $db ["port"] ?? 3306, $db ["user"] ?? 'root', $db ["password"] ?? '', $db ["options"] ?? [ ], $db ["cache"] ?? false);`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`