From e5625dfa88a05b59af3c89a646e2a341ba42f010 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Fri, 21 Jan 2011 21:07:46 +0100
Subject: [PATCH] And still more configuration checks.

---
 framework/Share/test/Horde/Share/SqlHierarchical/MysqlTest.php     | 2 +-
 framework/Share/test/Horde/Share/SqlHierarchical/MysqliTest.php    | 2 +-
 framework/Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php | 2 +-
 framework/Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php | 2 +-
 framework/Share/test/Horde/Share/Sqlng/Pdo/MysqlTest.php           | 2 +-
 framework/Share/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/Share/test/Horde/Share/SqlHierarchical/MysqlTest.php b/framework/Share/test/Horde/Share/SqlHierarchical/MysqlTest.php
index b40e1a85b..2e4326696 100644
--- a/framework/Share/test/Horde/Share/SqlHierarchical/MysqlTest.php
+++ b/framework/Share/test/Horde/Share/SqlHierarchical/MysqlTest.php
@@ -20,7 +20,7 @@ class Horde_Share_SqlHierarchical_MysqlTest extends Horde_Share_Test_SqlHierarch
             return;
         }
         $config = self::getConfig('SHARE_SQL_MYSQL_TEST_CONFIG');
-        if ($config) {
+        if ($config && !empty($config['share']['sql']['mysql'])) {
             self::$db = new Horde_Db_Adapter_Mysql($config['share']['sql']['mysql']);
             parent::setUpBeforeClass();
         }
diff --git a/framework/Share/test/Horde/Share/SqlHierarchical/MysqliTest.php b/framework/Share/test/Horde/Share/SqlHierarchical/MysqliTest.php
index 30082452c..d5e0a7acb 100644
--- a/framework/Share/test/Horde/Share/SqlHierarchical/MysqliTest.php
+++ b/framework/Share/test/Horde/Share/SqlHierarchical/MysqliTest.php
@@ -20,7 +20,7 @@ class Horde_Share_SqlHierarchical_MysqliTest extends Horde_Share_Test_SqlHierarc
             return;
         }
         $config = self::getConfig('SHARE_SQL_MYSQLI_TEST_CONFIG');
-        if ($config) {
+        if ($config && !empty($config['share']['sql']['mysqli'])) {
             self::$db = new Horde_Db_Adapter_Mysqli($config['share']['sql']['mysqli']);
             parent::setUpBeforeClass();
         }
diff --git a/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php b/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php
index f0324735f..7afcbaaa0 100644
--- a/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php
+++ b/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php
@@ -21,7 +21,7 @@ class Horde_Share_SqlHierarchical_Pdo_MysqlTest extends Horde_Share_Test_SqlHier
             return;
         }
         $config = self::getConfig('SHARE_SQL_PDO_MYSQL_TEST_CONFIG');
-        if ($config) {
+        if ($config && !empty($config['share']['sql']['pdo_mysql'])) {
             try {
                 self::$db = new Horde_Db_Adapter_Pdo_Mysql($config['share']['sql']['pdo_mysql']);
             } catch (Horde_Db_Exception $e) {
diff --git a/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php b/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php
index a4d3f927b..1644894cd 100644
--- a/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php
+++ b/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php
@@ -21,7 +21,7 @@ class Horde_Share_SqlHierarchical_Pdo_PgsqlTest extends Horde_Share_Test_SqlHier
             return;
         }
         $config = self::getConfig('SHARE_SQL_PDO_PGSQL_TEST_CONFIG');
-        if ($config) {
+        if ($config && !empty($config['share']['sql']['pdo_pgsql'])) {
             try {
                 self::$db = new Horde_Db_Adapter_Pdo_Pgsql($config['share']['sql']['pdo_pgsql']);
             } catch (Horde_Db_Exception $e) {
diff --git a/framework/Share/test/Horde/Share/Sqlng/Pdo/MysqlTest.php b/framework/Share/test/Horde/Share/Sqlng/Pdo/MysqlTest.php
index 887c21e2c..62f6bc3c3 100644
--- a/framework/Share/test/Horde/Share/Sqlng/Pdo/MysqlTest.php
+++ b/framework/Share/test/Horde/Share/Sqlng/Pdo/MysqlTest.php
@@ -21,7 +21,7 @@ class Horde_Share_Sqlng_Pdo_MysqlTest extends Horde_Share_Test_Sqlng_Base
             return;
         }
         $config = self::getConfig('SHARE_SQL_PDO_MYSQL_TEST_CONFIG');
-        if ($config) {
+        if ($config && !empty($config['share']['sql']['pdo_mysql'])) {
             self::$db = new Horde_Db_Adapter_Pdo_Mysql($config['share']['sql']['pdo_mysql']);
             parent::setUpBeforeClass();
         }
diff --git a/framework/Share/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php b/framework/Share/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php
index a36062d45..1533e9bb3 100644
--- a/framework/Share/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php
+++ b/framework/Share/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php
@@ -21,7 +21,7 @@ class Horde_Share_Sqlng_Pdo_PgsqlTest extends Horde_Share_Test_Sqlng_Base
             return;
         }
         $config = self::getConfig('SHARE_SQL_PDO_PGSQL_TEST_CONFIG');
-        if ($config) {
+        if ($config && !empty($config['share']['sql']['pdo_pgsql'])) {
             self::$db = new Horde_Db_Adapter_Pdo_Pgsql($config['share']['sql']['pdo_pgsql']);
             parent::setUpBeforeClass();
         }
-- 
2.11.0