First use drop statements corresponding to latest model

Otherwise we may be dropping an object table that still has container
tables referencing it.

12 files changed, 13 insertions, 13 deletions

diff --git a/evolution/add-column/makefile b/evolution/add-column/makefile
index 62d3aa9..f6dd0f3 100644
--- a/evolution/add-column/makefile
+++ b/evolution/add-column/makefile
@@ -86,8 +86,8 @@ $(dist):
 #
 $(test): $(driver)
         # Drop everything.
-	$(call schema,$(out_base)/test1.sql)
 	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
         # Base schema (-post is always empty).
 	$(call schema,$(out_base)/test2-002-pre.sql)
 	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
diff --git a/evolution/add-foreign-key/makefile b/evolution/add-foreign-key/makefile
index 88942b3..d06a50e 100644
--- a/evolution/add-foreign-key/makefile
+++ b/evolution/add-foreign-key/makefile
@@ -87,8 +87,8 @@ $(dist):
 #
 $(test): $(driver)
         # Drop everything.
-	$(call schema,$(out_base)/test1.sql)
 	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
         # Base schema (-post is always empty).
 	$(call schema,$(out_base)/test2-002-pre.sql)
 	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
diff --git a/evolution/add-index/makefile b/evolution/add-index/makefile
index cf2beca..32e2e04 100644
--- a/evolution/add-index/makefile
+++ b/evolution/add-index/makefile
@@ -86,8 +86,8 @@ $(dist):
 #
 $(test): $(driver)
         # Drop everything.
-	$(call schema,$(out_base)/test1.sql)
 	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
         # Base schema (-post is always empty).
 	$(call schema,$(out_base)/test2-002-pre.sql)
 	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
diff --git a/evolution/add-table/makefile b/evolution/add-table/makefile
index 36639ac..76cb897 100644
--- a/evolution/add-table/makefile
+++ b/evolution/add-table/makefile
@@ -86,8 +86,8 @@ $(dist):
 #
 $(test): $(driver)
         # Drop everything.
-	$(call schema,$(out_base)/test1.sql)
 	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
         # Base schema (-post is always empty).
 	$(call schema,$(out_base)/test2-002-pre.sql)
 	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
diff --git a/evolution/alter-column/makefile b/evolution/alter-column/makefile
index 2a35005..fffbef8 100644
--- a/evolution/alter-column/makefile
+++ b/evolution/alter-column/makefile
@@ -86,8 +86,8 @@ $(dist):
 #
 $(test): $(driver)
         # Drop everything.
-	$(call schema,$(out_base)/test1.sql)
 	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
         # Base schema (-post is always empty).
 	$(call schema,$(out_base)/test2-002-pre.sql)
 	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
diff --git a/evolution/drop-column/makefile b/evolution/drop-column/makefile
index 1e8945d..af51386 100644
--- a/evolution/drop-column/makefile
+++ b/evolution/drop-column/makefile
@@ -86,8 +86,8 @@ $(dist):
 #
 $(test): $(driver)
         # Drop everything.
-	$(call schema,$(out_base)/test1.sql)
 	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
         # Base schema (-post is always empty).
 	$(call schema,$(out_base)/test2-002-pre.sql)
 	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
diff --git a/evolution/drop-foreign-key/makefile b/evolution/drop-foreign-key/makefile
index 6082e0f..97509a6 100644
--- a/evolution/drop-foreign-key/makefile
+++ b/evolution/drop-foreign-key/makefile
@@ -87,8 +87,8 @@ $(dist):
 #
 $(test): $(driver)
         # Drop everything.
-	$(call schema,$(out_base)/test1.sql)
 	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
         # Base schema (-post is always empty).
 	$(call schema,$(out_base)/test2-002-pre.sql)
 	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
diff --git a/evolution/drop-index/makefile b/evolution/drop-index/makefile
index 4f407eb..e96b66d 100644
--- a/evolution/drop-index/makefile
+++ b/evolution/drop-index/makefile
@@ -86,8 +86,8 @@ $(dist):
 #
 $(test): $(driver)
         # Drop everything.
-	$(call schema,$(out_base)/test1.sql)
 	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
         # Base schema (-post is always empty).
 	$(call schema,$(out_base)/test2-002-pre.sql)
 	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
diff --git a/evolution/drop-table/makefile b/evolution/drop-table/makefile
index def245e..091a679 100644
--- a/evolution/drop-table/makefile
+++ b/evolution/drop-table/makefile
@@ -86,8 +86,8 @@ $(dist):
 #
 $(test): $(driver)
         # Drop everything.
-	$(call schema,$(out_base)/test1.sql)
 	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
         # Base schema (-post is always empty).
 	$(call schema,$(out_base)/test2-002-pre.sql)
 	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
diff --git a/evolution/template/makefile b/evolution/template/makefile
index 0ac359f..a914292 100644
--- a/evolution/template/makefile
+++ b/evolution/template/makefile
@@ -86,8 +86,8 @@ $(dist):
 #
 $(test): $(driver)
         # Drop everything.
-	$(call schema,$(out_base)/test1.sql)
 	$(call schema,$(out_base)/test2.sql)
+	$(call schema,$(out_base)/test1.sql)
         # Base schema (-post is always empty).
 	$(call schema,$(out_base)/test2-002-pre.sql)
 	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
diff --git a/evolution/tester b/evolution/tester
index 5ccb839..3f9e7e8 100755
--- a/evolution/tester
+++ b/evolution/tester
@@ -14,8 +14,8 @@ if test -f test1.sql; then
   #
 
   # Drop everything.
-  $top_builddir/db-driver test1.sql || exit 1
   $top_builddir/db-driver test2.sql || exit 1
+  $top_builddir/db-driver test1.sql || exit 1
 
   # Base schema (-post is always empty).
   $top_builddir/db-driver test2-002-pre.sql || exit 1
diff --git a/evolution/tester.bat b/evolution/tester.bat
index ea40b35..5b949b4 100644
--- a/evolution/tester.bat
+++ b/evolution/tester.bat
@@ -28,10 +28,10 @@ if exist test*.sql (
 
   rem Drop everything.
   rem
-  call %topdir%\%1-driver.bat test1.sql
+  call %topdir%\%1-driver.bat test2.sql
   if errorlevel 1 goto error
 
-  call %topdir%\%1-driver.bat test2.sql
+  call %topdir%\%1-driver.bat test1.sql
   if errorlevel 1 goto error
 
   rem Base schema (-post is always empty).