missing /etc/dbs.yaml

diff --git a/etc/dbq.yaml b/etc/dbq.yaml
index 77524aee50d654569e8dcb1fd2666e2449bba734..2f3e6fc5ecfb59f97002260d1e3705fa180950cc 100644 (file)
--- a/etc/dbq.yaml
+++ b/etc/dbq.yaml
@@ -1,6 +1,3 @@
-_nico:
-  user: nico
-
 _mysql:
   type: mysql
 

diff --git a/lib/php/db.php b/lib/php/db.php
index f2fad75e62f8be00abd64bba9509bae85be48259..dcdcc9e550e18e844ed3eb5131c5a9978d918bfd 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -541,9 +541,8 @@ class Db extends nb {
     #
 
     $dbs = [];
-    if (is_scalar($files)) $files = array($files);
-
-    foreach ($files as $file) {
+    #if (is_scalar($files)) $files = array($files);
+    foreach ((array)$files as $file) {
 
       $file = self::untilde($file);
 
@@ -560,7 +559,6 @@ class Db extends nb {
 
     }
     unset($yaml,$DBQ);
-    if (!$dbs) return false;
 
     #
     # Import database conf with key _import
@@ -570,13 +568,13 @@ class Db extends nb {
       $params = (array)$params;
 
       # If _default exists spush it to all dbs's _import
-      if ($id == '_default') {
-        continue;
-      } elseif(!empty($dbs['_default'])) {
-        if (empty($params['_import'])) $params['_import'] = [];
-        elseif (is_scalar($params['_import'])) $params['_import'] = (array)$params['_import'];
-        $params['_import'][] = '_default';
-      }
+# NB 21.09.16       if ($id == '_default') {
+# NB 21.09.16         continue;
+# NB 21.09.16       } elseif(!empty($dbs['_default'])) {
+# NB 21.09.16         if (empty($params['_import'])) $params['_import'] = [];
+# NB 21.09.16         elseif (is_scalar($params['_import'])) $params['_import'] = (array)$params['_import'];
+# NB 21.09.16         $params['_import'][] = '_default';
+# NB 21.09.16       }
 
       foreach ($params as $k => $v) {
         if ($k != '_import') continue;
@@ -598,6 +596,8 @@ class Db extends nb {
     # Remove db starting with _
     foreach ($dbs as $db=>$o) { if (preg_match('/^_/',$db)) unset($dbs[$db]); }
 
+    if (!$dbs) return false;
+
     # Add missing name
     foreach ($dbs as $db=>$o) {
       if (empty($o['name'])) $dbs[$db]['name'] = $db;
@@ -612,6 +612,8 @@ class Db extends nb {
       return($a_-$b_);
     });
 
+    #debug($file);
+    #bye($dbs['nb']);
     if (!$dbs) return false;
     if ($first !== false) $first = self::ar_first($dbs);
     return $dbs;

diff --git a/lib/php/db/config.php b/lib/php/db/config.php
index a2dbe1424d388acfa99e2eaa1a516d2bdf2be6e3..6b482fc93a3e1fbfcd50b5cc6d361314aae4facd 100644 (file)
--- a/lib/php/db/config.php
+++ b/lib/php/db/config.php
@@ -2,8 +2,6 @@
 require_once(realpath(dirname(__FILE__).'/../config.php'));
 require_once(realpath(dirname(__FILE__).'/../db.php'));
 
-Db::pinit();
-
 $DB_CONFS = Db::conf_load([
   Db::ROOT_DIR.'/etc/dbs.yaml',
   Db::ROOT_DIR.'/etc/dbs.php',
@@ -11,6 +9,7 @@ $DB_CONFS = Db::conf_load([
   Db::ROOT_DIR.'/etc/dbq.yaml',
   Db::ROOT_DIR.'/etc/dbq.php',
 
+  '/etc/dbs.yaml',
   '/etc/dbq.yaml',
 
   '/etc/dbq.yaml',