From 72c58306ba3a604aad2714a5907cdc448909001c Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Fri, 25 Aug 2017 01:56:34 +0200 Subject: [PATCH] Fix the previous fix. See #614. Again. Should be ok now. --- src/pgsql/pgsql-create-schema.lisp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pgsql/pgsql-create-schema.lisp b/src/pgsql/pgsql-create-schema.lisp index e3fc370..938049c 100644 --- a/src/pgsql/pgsql-create-schema.lisp +++ b/src/pgsql/pgsql-create-schema.lisp @@ -69,18 +69,22 @@ (when include-drop ;; if asked, first DROP the schema CASCADE. (loop :for schema :in (catalog-schema-list catalog) - :for schema-name := (ensure-unquoted (schema-name schema)) + :for schema-name := (schema-name schema) :when (and schema-name - (member schema-name schema-list :test #'string=)) + (member (ensure-unquoted schema-name) + schema-list + :test #'string=)) :do (let ((sql (format nil "DROP SCHEMA ~a CASCADE;" schema-name))) (pgsql-execute sql :client-min-messages client-min-messages)))) ;; now create the schemas (again?) (loop :for schema :in (catalog-schema-list catalog) - :for schema-name := (ensure-unquoted (schema-name schema)) + :for schema-name := (schema-name schema) :when (and schema-name (or include-drop - (not (member schema-name schema-list :test #'string=)))) + (not (member (ensure-unquoted schema-name) + schema-list + :test #'string=)))) :do (let ((sql (format nil "CREATE SCHEMA ~a;" (schema-name schema)))) (pgsql-execute sql :client-min-messages client-min-messages)))))