From e7afe993fa605560d14128933995f4ced6c51b85 Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Sat, 6 May 2017 14:45:05 +0200 Subject: [PATCH] Review database migration logic and options again. In #539 it appears that we fail to honor some actions, and it seems to be because of sloppy reasonning in how to make sense of all of them. It could well be that we have too many options for them to make sense in all possible combinations, but for now it looks safe to bet on an easy fix... --- src/sources/common/db-methods.lisp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sources/common/db-methods.lisp b/src/sources/common/db-methods.lisp index 304e2c3..646afc8 100644 --- a/src/sources/common/db-methods.lisp +++ b/src/sources/common/db-methods.lisp @@ -236,8 +236,8 @@ (create-tables (and create-tables create-ddl)) (create-schemas (and create-schemas create-ddl)) (foreign-keys (and foreign-keys create-ddl)) - (drop-indexes (or create-ddl include-drop)) - (create-indexes (or drop-indexes (and create-indexes create-ddl))) + (drop-indexes (and include-drop create-ddl)) + (create-indexes (and create-indexes drop-indexes create-ddl)) (*preserve-index-names* (or (eq :preserve index-names)