From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Mon, 25 Nov 2024 13:51:01 +0000 (+0100)
Subject: lib/php/db.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=e13b236bc460bc906052d74a43aed4c9e6e2e1f7;p=nb.git

lib/php/db.php
---

diff --git a/lib/php/db.php b/lib/php/db.php
index c7fb2101..eb29b313 100644
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -801,26 +801,6 @@ class Db extends nb {
 		#
 		# First iteration: Import database conf with key _import
 		#
-# NB 22.01.19 		foreach (self::$dbq as $id=>$params) {
-# NB 22.01.19 			$params = (array)$params;
-# NB 22.01.19 
-# NB 22.01.19 			foreach ($params as $k => $v) {
-# NB 22.01.19 				if ($k != '_import') continue;
-# NB 22.01.19 
-# NB 22.01.19 				$import = is_array($v) ? $v : explode(',',$v);
-# NB 22.01.19 				#debug(join(', ',$import));
-# NB 22.01.19 				foreach ($import as $v) {
-# NB 22.01.19 					if ($id == $v) self::bye("Infinite loop: _import $id = $v");
-# NB 22.01.19 					if (empty(self::$dbq[$v])) continue;
-# NB 22.01.19 
-# NB 22.01.19 					foreach (self::$dbq[$v] as $kk => $vv) {
-# NB 22.01.19 						if (!isset($params[$kk])) self::$dbq[$id][$kk] = $vv;
-# NB 22.01.19 					}
-# NB 22.01.19 				}
-# NB 22.01.19 
-# NB 22.01.19 				unset(self::$dbq[$id][$k]);
-# NB 22.01.19 			}
-# NB 22.01.19 		}
 
 		# We use ar_merge
 		foreach (self::$dbq as $id=>$params) {
@@ -833,7 +813,9 @@ class Db extends nb {
 
 			foreach ($import as $i) {
 				if (!isset(self::$dbq[$i])) continue;
-				self::$dbq[$id] = self::ar_merge(self::$dbq[$id],self::$dbq[$i]);
+				# NB 25.11.24: Current hash option should be prioritary to import  
+				# NB 25.11.24 self::$dbq[$id] = self::ar_merge(self::$dbq[$id],self::$dbq[$i]);
+				self::$dbq[$id] = self::ar_merge(self::$dbq[$i],self::$dbq[$id]);
 				#debug([$id,self::$dbq[$id]['tables']]);
 				#debug([$id,self::$dbq[$i]['tables']]);
 			}