From f20d7cb45223b000b393e376296a61eacbf9093f Mon Sep 17 00:00:00 2001
From: Dimitri Fontaine <dim@tapoueh.org>
Date: Fri, 19 Dec 2014 14:41:49 +0100
Subject: [PATCH] Some more cleanup after the *pgconn* refactoring.

---
 src/package.lisp                 | 6 +-----
 src/parsers/command-archive.lisp | 9 ++-------
 src/sources/mssql.lisp           | 4 ++--
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/package.lisp b/src/package.lisp
index a0f7363..1fccc7d 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -404,11 +404,7 @@
 	   #:*state*
 	   #:*csv-path-root*
 	   #:*root-dir*
-	   #:*pgconn-host*
-	   #:*pgconn-port*
-	   #:*pgconn-user*
-	   #:*pgconn-pass*
-	   #:*pg-dbname*
+	   #:*pgconn*
 	   #:*pg-settings*
 	   #:*myconn-host*
 	   #:*myconn-port*
diff --git a/src/parsers/command-archive.lisp b/src/parsers/command-archive.lisp
index bce07d1..41f8f09 100644
--- a/src/parsers/command-archive.lisp
+++ b/src/parsers/command-archive.lisp
@@ -41,16 +41,11 @@
     (destructuring-bind (source pg-db-uri &key before commands finally) archive
       (when (and (or before finally) (null pg-db-uri))
         (error "When using a BEFORE LOAD DO or a FINALLY block, you must provide an archive level target database connection."))
-      (destructuring-bind (&key host port user password dbname &allow-other-keys)
-          pg-db-uri
+      (destructuring-bind (&key dbname &allow-other-keys) pg-db-uri
         `(lambda ()
            (let* ((state-before   (pgloader.utils:make-pgstate))
                   (*state*        (pgloader.utils:make-pgstate))
-                  (*pgconn-host* ',host)
-                  (*pgconn-port* ,port)
-                  (*pgconn-user* ,user)
-                  (*pgconn-pass* ,password)
-                  (*pg-dbname*   ,dbname)
+                  ,@(pgsql-connection-bindings pg-db-uri nil)
                   (state-finally ,(when finally `(pgloader.utils:make-pgstate)))
                   (archive-file
                    ,(destructuring-bind (kind url) source
diff --git a/src/sources/mssql.lisp b/src/sources/mssql.lisp
index 338c920..27dc42a 100644
--- a/src/sources/mssql.lisp
+++ b/src/sources/mssql.lisp
@@ -128,12 +128,12 @@
     ;;
     ;; Turn UNIQUE indexes into PRIMARY KEYS now
     ;;
-    (pgstate-add-table state *pg-dbname* "Primary Keys")
+    (pgstate-add-table state (pgconn-dbname) "Primary Keys")
     (loop :for sql :in pkeys
        :when sql
        :do (progn
              (log-message :notice "~a" sql)
-             (pgsql-execute-with-timing *pg-dbname* "Primary Keys" sql state)))
+             (pgsql-execute-with-timing (pgconn-dbname) "Primary Keys" sql state)))
 
     ;;
     ;; Foreign Key Constraints