Use database name in options and driver files (build part)

This way we will be able to have several databases configured at the
same time, which is needed for multi-database support testing.

14 files changed, 42 insertions, 42 deletions

diff --git a/evolution/add-column/makefile b/evolution/add-column/makefile
index 0447ad4..a49ff52 100644
--- a/evolution/add-column/makefile
+++ b/evolution/add-column/makefile
@@ -98,13 +98,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/add-foreign-key/makefile b/evolution/add-foreign-key/makefile
index c4eaef2..d3c9873 100644
--- a/evolution/add-foreign-key/makefile
+++ b/evolution/add-foreign-key/makefile
@@ -99,13 +99,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/add-index/makefile b/evolution/add-index/makefile
index 26ba8f0..c46222f 100644
--- a/evolution/add-index/makefile
+++ b/evolution/add-index/makefile
@@ -98,13 +98,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/add-table/makefile b/evolution/add-table/makefile
index 8bcacb1..4d92861 100644
--- a/evolution/add-table/makefile
+++ b/evolution/add-table/makefile
@@ -98,13 +98,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/alter-column/makefile b/evolution/alter-column/makefile
index f1cef39..3c198a2 100644
--- a/evolution/alter-column/makefile
+++ b/evolution/alter-column/makefile
@@ -98,13 +98,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/combined/makefile b/evolution/combined/makefile
index 81bfd3a..b243f60 100644
--- a/evolution/combined/makefile
+++ b/evolution/combined/makefile
@@ -98,13 +98,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/data/makefile b/evolution/data/makefile
index 7b1cc8e..ea711ed 100644
--- a/evolution/data/makefile
+++ b/evolution/data/makefile
@@ -96,13 +96,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/drop-column/makefile b/evolution/drop-column/makefile
index 5c02c01..6f6cc6b 100644
--- a/evolution/drop-column/makefile
+++ b/evolution/drop-column/makefile
@@ -98,13 +98,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/drop-foreign-key/makefile b/evolution/drop-foreign-key/makefile
index db62bfa..b22ce9d 100644
--- a/evolution/drop-foreign-key/makefile
+++ b/evolution/drop-foreign-key/makefile
@@ -99,13 +99,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/drop-index/makefile b/evolution/drop-index/makefile
index 1bda96f..072e830 100644
--- a/evolution/drop-index/makefile
+++ b/evolution/drop-index/makefile
@@ -98,13 +98,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/drop-table/makefile b/evolution/drop-table/makefile
index a9ad2f9..9165559 100644
--- a/evolution/drop-table/makefile
+++ b/evolution/drop-table/makefile
@@ -98,13 +98,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/embedded/makefile b/evolution/embedded/makefile
index dfa675a..e8f5892 100644
--- a/evolution/embedded/makefile
+++ b/evolution/embedded/makefile
@@ -90,11 +90,11 @@ $(dist):
 #
 $(test): $(driver)
         # Base schema.
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/template/makefile b/evolution/template/makefile
index f3a19bd..9df8125 100644
--- a/evolution/template/makefile
+++ b/evolution/template/makefile
@@ -98,13 +98,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #
diff --git a/evolution/version/makefile b/evolution/version/makefile
index eab7cb8..fa365d6 100644
--- a/evolution/version/makefile
+++ b/evolution/version/makefile
@@ -98,13 +98,13 @@ $(test): $(driver)
         # Base schema.
 	$(call schema,$(out_base)/test3-002-pre.sql)
 	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
         # Migration.
 	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
 	$(call schema,$(out_base)/test3-003-post.sql)
         # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
 
 # Clean.
 #