From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Mon, 8 Jan 2018 03:20:28 +0000 (+0000)
Subject: www/dbq/dbq.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=3b03747b73948bfbb44e659207f8c962c2fffe0b;p=nb.git

www/dbq/dbq.php
---

diff --git a/lib/php/db.php b/lib/php/db.php
index ca1e19ab..6debf616 100644
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -1038,7 +1038,6 @@ class Db extends nb {
       echo rtrim($s,';').";\n";
     }
 
-      #bye($this->db()->type);
     if ($type_from == 'mysql') $views = []; # Mysql store sql create view in mysql format wich only works with mysql
     echo "\n-- SQL\n";
     foreach (array_merge($tables,$views) as $t) {
diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 37ba0e5e..7616cff0 100644
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -352,11 +352,20 @@ class DbQ extends nb {
 		}
 
 		if (!empty($_SERVER['DBQ_CONF_DIR'])) {
+			foreach (explode(' ',$_SERVER['DBQ_CONF_DIR']) as $dir) {
+				$DB_CONFS = array_merge($DB_CONFS,
+					(array)glob($dir.'/*.yml'),
+					(array)glob($dir.'/*.yaml'),
+					(array)glob($dir.'/*.php'),
+				[]);
+			}
+/*
 			$DB_CONFS = array_merge($DB_CONFS,
 				(array)glob($_SERVER['DBQ_CONF_DIR'].'/*.yml'),
 				(array)glob($_SERVER['DBQ_CONF_DIR'].'/*.yaml'),
 				(array)glob($_SERVER['DBQ_CONF_DIR'].'/*.php'),
 			[]);
+*/
 		}
 
 		if (empty($DB_CONFS)) {