diff --git a/src/params.lisp b/src/params.lisp index 9a1f2f8..e00369f 100644 --- a/src/params.lisp +++ b/src/params.lisp @@ -55,11 +55,20 @@ (defparameter *copy-batch-split* 5 "Number of batches in which to split a batch with bad data") +;;; +;;; We need that to setup our default connection parameters +;;; +(eval-when (:compile-toplevel :load-toplevel :execute) + (defun getenv-default (name &optional default) + "Return the value of the NAME variable as found in the environment, or + DEFAULT if that variable isn't set" + (or (uiop:getenv name) default))) + ;;; ;;; PostgreSQL Connection Credentials and Session Settings ;;; (defparameter *pgconn-host* "localhost") -(defparameter *pgconn-port* (or (parse-integer (uiop:getenv "PGPORT")) 5432)) +(defparameter *pgconn-port* (parse-integer (getenv-default "PGPORT" "5432"))) (defparameter *pgconn-user* (uiop:getenv "USER")) (defparameter *pgconn-pass* "pgpass") (defparameter *pg-settings* nil "An alist of GUC names and values.") diff --git a/src/parser.lisp b/src/parser.lisp index 477e794..e3da182 100644 --- a/src/parser.lisp +++ b/src/parser.lisp @@ -4,11 +4,6 @@ (in-package :pgloader.parser) -(defun getenv-default (name &optional default) - "Return the value of the NAME variable as found in the environment, or - DEFAULT if that variable isn't set" - (or (uiop:getenv name) default)) - (defvar *data-expected-inline* nil "Set to :inline when parsing an INLINE keyword in a FROM clause.")