From cd1d5ad597db7d8ad558373fb821ffb84204af01 Mon Sep 17 00:00:00 2001
From: Dimitri Fontaine <dim@tapoueh.org>
Date: Wed, 25 Dec 2013 16:50:14 +0100
Subject: [PATCH] Fix missing *pg-dbname* in CSV processing, resulting in
 broken logging.

---
 src/parser.lisp |  1 +
 src/utils.lisp  | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/parser.lisp b/src/parser.lisp
index 1b4287e..1fe9097 100644
--- a/src/parser.lisp
+++ b/src/parser.lisp
@@ -1567,6 +1567,7 @@ load database
 		  (*pgconn-port* ,port)
 		  (*pgconn-user* ,user)
 		  (*pgconn-pass* ,password)
+                  (*pg-dbname*   ,dbname)
 		  (*pg-settings* ',gucs))
 
 	     (progn
diff --git a/src/utils.lisp b/src/utils.lisp
index 7a00051..9517bb3 100644
--- a/src/utils.lisp
+++ b/src/utils.lisp
@@ -215,21 +215,22 @@
    given DBNAME and TABLE-NAME"
   (let ((result (gensym "result"))
 	(secs   (gensym "secs")))
-    `(prog2
-	 (pgstate-add-table ,pgstate ,dbname ,table-name)
-	 (multiple-value-bind (,result ,secs)
-	     (timing ,@forms)
-	   (cond ((and ,use-result-as-read ,use-result-as-rows)
-                  (pgstate-incf ,pgstate ,table-name
-                                :read ,result :rows ,result :secs ,secs))
-                 (,use-result-as-read
-                  (pgstate-incf ,pgstate ,table-name :read ,result :secs ,secs))
-                 (,use-result-as-rows
-                  (pgstate-incf ,pgstate ,table-name :rows ,result :secs ,secs))
-                 (t
-                  (pgstate-incf ,pgstate ,table-name :secs ,secs)))
-	   ,result)
-       (when ,summary (report-summary)))))
+    `(let ((*pg-dbname* (or ,dbname *pg-dbname*)))
+       (prog2
+           (pgstate-add-table ,pgstate *pg-dbname* ,table-name)
+           (multiple-value-bind (,result ,secs)
+               (timing ,@forms)
+             (cond ((and ,use-result-as-read ,use-result-as-rows)
+                    (pgstate-incf ,pgstate ,table-name
+                                  :read ,result :rows ,result :secs ,secs))
+                   (,use-result-as-read
+                    (pgstate-incf ,pgstate ,table-name :read ,result :secs ,secs))
+                   (,use-result-as-rows
+                    (pgstate-incf ,pgstate ,table-name :rows ,result :secs ,secs))
+                   (t
+                    (pgstate-incf ,pgstate ,table-name :secs ,secs)))
+             ,result)
+         (when ,summary (report-summary))))))
 
 (defun report-full-summary (legend state
 			    &key before finally parallel)