www/dbq/dbq.php

diff --git a/lib/php/db.php b/lib/php/db.php
index ca1e19abac97f0f567d375f2e2d69b8b42eefb04..6debf6164f7650bef9ba52a7d759b1faaf075d25 100644 (file)
--- 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 37ba0e5e095f32ff9d589d2d33f9d078134f353a..7616cff04da2457af9bf2216dc52e6e8039cd5ac 100644 (file)
--- 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)) {