pdo_info

diff --git a/lib/php/config.php b/lib/php/config.php
index 6f259fb244baab3636d078af92fabcbfc932d762..e6e5c9367510485aee4b42e7e2b4ecb6a3d7bd32 100644 (file)
--- a/lib/php/config.php
+++ b/lib/php/config.php
@@ -16,7 +16,7 @@ if (nb::php_cli()) {
 
 ini_set('display_errors',
   empty($_SERVER['PROD'])
-  && !nb::php_cli()
+  or nb::php_cli()
 );
 
 if (!ini_get('UTC')) date_default_timezone_set('UTC');

diff --git a/lib/php/db.php b/lib/php/db.php
index 1d91767a5a953e775b3d175fad08993e2cb60f91..514ea6eec48a2cbf78524b4af26cd425daf82147 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -234,7 +234,7 @@ class Db extends nb {
   #}
 
     if (empty($this->conn)) {
-      $this->bye("Connection failed: ".$this->pdo_info($this->pdo));
+      $this->bye("Connection failed: ".$this->pdo_info());
       return false;
     }
 
@@ -514,6 +514,8 @@ class Db extends nb {
 
           $count = 0;
           while ($line = fgets(STDIN)) {
+            $line = preg_replace('/^\s*(.*?)\s*;?\s*$/','$1',$line);
+            if (!$line) continue;
             $count++;
             #echo "$count> $line";
             $this->conn->exec($line);
@@ -670,18 +672,6 @@ class Db extends nb {
     if ($id and preg_match('/^(\w+):(.*)/',$id,$m)) {
       if (empty($conf[$id])) $conf[$id] = [];
       $conf[$id] = $conf[$id] + self::pdo2h($id);
-# NB 26.10.16       $conf[$id] = array(
-# NB 26.10.16         'pdo' => $id,
-# NB 26.10.16         'type' => $m[1],
-# NB 26.10.16       );
-# NB 26.10.16       debug(self::pdo2h($id));
-# NB 26.10.16 
-# NB 26.10.16       foreach (explode(' ',self::pdo_info($m[2])) as $o) {
-# NB 26.10.16         if (strpos($o,'=') === false) continue;
-# NB 26.10.16         list($k,$v) = explode('=',$o);
-# NB 26.10.16         $conf[$id][$k] = $v;
-# NB 26.10.16       }
-      #debug(self::pdo_info($m[2])));
     }
 
     if (!$conf) return false;
@@ -777,11 +767,15 @@ class Db extends nb {
     return $hash;
   }
 
-  public static function pdo_info($pdo) {
-    $infos = self::pdo2h($pdo);
-    foreach ($infos as $k=>$v) {
-      if (!preg_match('/^(host|dbname|name)/',$k)) unset($infos[$k]);
+  public function pdo_info() {#$pdo) {
+    $infos = [];
+
+    foreach (self::pdo2h($this->pdo) as $k=>$v) {
+      if (!preg_match('/^(host|port|dbname|name|user)/',$k)) continue;
+      $infos[] = "$k=$v";
     }
+
+    return join(' ',$infos);
   }
 
   public function dump2csv() {
@@ -848,8 +842,7 @@ class Db extends nb {
     echo ''
       #."-- Database : ".$this->name."\n"
       ."-- Date     : ".strftime('%F %T')."\n"
-      ."-- Pdo      : ".$this->pdo_info($this->pdo)."\n"
-      #."-- Host     : ".$this->host."\n"
+      ."-- Pdo      : ".$this->pdo_info()."\n"
     ;
 
     # Change db type if needed