Fix bug

diff --git a/etc/dbq/local.php b/etc/dbq/local.php
deleted file mode 100644 (file)
index e3cffec..0000000
--- a/etc/dbq/local.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-#
-# !!! MANDATORY !!!
-#
-if (true or !nb::is_vm()) $DBQ = [
-  'shell' => [
-    'type' => 'sqlite',
-    'name' => 'shell',
-    'host' => nb::ROOT_DIR.'/share/db/shell.db',
-  ],
-];
-?>

diff --git a/etc/dbq/shell.php b/etc/dbq/shell.php
new file mode 100644 (file)
index 0000000..e3cffec
--- /dev/null
+++ b/etc/dbq/shell.php
@@ -0,0 +1,12 @@
+<?php
+#
+# !!! MANDATORY !!!
+#
+if (true or !nb::is_vm()) $DBQ = [
+  'shell' => [
+    'type' => 'sqlite',
+    'name' => 'shell',
+    'host' => nb::ROOT_DIR.'/share/db/shell.db',
+  ],
+];
+?>

diff --git a/etc/dbq/zzz-all.php b/etc/dbq/zzz-all.php
index ef9ac2c3514cf58a66bd4bb4f37c04fefcb70aae..6ed014da828bde392c85c7a56df240d0abfafa0e 100644 (file)
--- a/etc/dbq/zzz-all.php
+++ b/etc/dbq/zzz-all.php
@@ -42,6 +42,7 @@ $DBQ['all'] = [
   'host' => ':memory:',
   'type' => 'sqlite',
   'pdo' => '',
+  '_import' => 'nb',
   #'order' => '0',
   'options' => [
     PDO::ATTR_PERSISTENT => true,
@@ -69,13 +70,18 @@ foreach ($DBQ as $id => $db) {
   $fname = basename($db['host'],'.db');
   $fname = preg_replace('/\..*$/','',basename($db['host']));
 
-  $DBQ['all']['types']['sql_pre'][] = "ATTACH DATABASE '".$db['host']."' as ".$fname."";
-  if (!isset($DBQ[$fname]['name'])) $DBQ[$fname]['name'] = $fname;
-  conf_merge($DBQ[$fname],$DBQ['all']);
+  #$DBQ['all']['types']['sql_pre'][] = "DETACH DATABASE '".$db['host']."'";
+  $DBQ['all']['types']['sql_pre'][] = "ATTACH DATABASE '".$db['host']."' as ".$fname;
+  $DBQ['all']['_import'] = empty($DBQ['all']['_import']) ? [] : (array)$DBQ['all']['_import'];
+  $DBQ['all']['_import'][] = $id;
+# NB 21.11.16   if (!isset($DBQ[$fname]['name'])) $DBQ[$fname]['name'] = $fname;
+# NB 21.11.16   conf_merge($DBQ[$fname],$DBQ['all']);
 
 }
 
-if (!empty($DBQ['nb'])) conf_merge($DBQ['nb'],$DBQ['all']);
+#debug($DBQ['nb-sqlite']['default_table']);
+#if (!empty($DBQ['nb-sqlite'])) debug($DBQ['nb-sqlite']);
+#if (!empty($DBQ['nb'])) conf_merge($DBQ['nb'],$DBQ['all']);
 
 #
 # Functions

diff --git a/lib/php/db.php b/lib/php/db.php
index bdf6f72803b59b29e700956740b4714c22e45cca..32d9b6d44a0638d1030fc0273674e8093192e485 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -690,7 +690,7 @@ class Db extends nb {
 
         $import = is_array($v) ? $v : explode(',',$v);
         foreach ($import as $v) {
-          if ($id == $v) this::bye("Infinite loop: _import $id = $v");
+          if ($id == $v) self::bye("Infinite loop: _import $id = $v");
           if (empty($dbs[$v])) continue;
 
           foreach ($dbs[$v] as $kk => $vv) {
@@ -1051,6 +1051,10 @@ class Db extends nb {
       'port' => $this->port,
       'user' => $this->user,
     ])
+    +[
+      'title' => $this->title,
+      'default_table' => $this->default_table,
+    ]
     +$new;
 
     if (($sqls=$this->conf_type('status'))) {

diff --git a/src/Docker/nginx/default.conf b/src/Docker/nginx/default.conf
index 930ae06080736726db7de18ca7a36c1ca6623acc..ac59a71a71c0f5c4d2b2d4ca868daa5db0abc02a 100644 (file)
--- a/src/Docker/nginx/default.conf
+++ b/src/Docker/nginx/default.conf
@@ -12,9 +12,11 @@ server {
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }
 
-    access_log off;
-    error_log  /var/log/nginx/error.log error;
+    #access_log off;
+    #error_log  /var/log/nginx/error.log error;
 
+    error_log  /dev/stderr error;
+    access_log  /dev/stdout main;
     sendfile off;
 
     client_max_body_size 100m;