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.

20 files changed, 20 insertions, 20 deletions

diff --git a/qt/common/basic/makefile b/qt/common/basic/makefile
index 82500c4..eea4f93 100644
--- a/qt/common/basic/makefile
+++ b/qt/common/basic/makefile
@@ -83,7 +83,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/common/containers/basics/makefile b/qt/common/containers/basics/makefile
index 975c2c7..a992a2f 100644
--- a/qt/common/containers/basics/makefile
+++ b/qt/common/containers/basics/makefile
@@ -83,7 +83,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/common/containers/change-tracking/makefile b/qt/common/containers/change-tracking/makefile
index f957328..c14aeaf 100644
--- a/qt/common/containers/change-tracking/makefile
+++ b/qt/common/containers/change-tracking/makefile
@@ -83,7 +83,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/common/smart-ptr/makefile b/qt/common/smart-ptr/makefile
index d504bc3..2619fd2 100644
--- a/qt/common/smart-ptr/makefile
+++ b/qt/common/smart-ptr/makefile
@@ -83,7 +83,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/common/template/makefile b/qt/common/template/makefile
index 372cb1e..3ec25d2 100644
--- a/qt/common/template/makefile
+++ b/qt/common/template/makefile
@@ -83,7 +83,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/mssql/basic/makefile b/qt/mssql/basic/makefile
index 4fe510b..43fa876 100644
--- a/qt/mssql/basic/makefile
+++ b/qt/mssql/basic/makefile
@@ -81,7 +81,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/mssql/date-time/makefile b/qt/mssql/date-time/makefile
index c1fcc99..f2ded55 100644
--- a/qt/mssql/date-time/makefile
+++ b/qt/mssql/date-time/makefile
@@ -81,7 +81,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/mssql/template/makefile b/qt/mssql/template/makefile
index c047418..33ebd1e 100644
--- a/qt/mssql/template/makefile
+++ b/qt/mssql/template/makefile
@@ -75,7 +75,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/mysql/basic/makefile b/qt/mysql/basic/makefile
index 73c54c1..8b174a5 100644
--- a/qt/mysql/basic/makefile
+++ b/qt/mysql/basic/makefile
@@ -81,7 +81,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/mysql/date-time/makefile b/qt/mysql/date-time/makefile
index 59ad1ed..448cdcd 100644
--- a/qt/mysql/date-time/makefile
+++ b/qt/mysql/date-time/makefile
@@ -81,7 +81,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/mysql/template/makefile b/qt/mysql/template/makefile
index c45aa0d..91c5afe 100644
--- a/qt/mysql/template/makefile
+++ b/qt/mysql/template/makefile
@@ -75,7 +75,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/oracle/basic/makefile b/qt/oracle/basic/makefile
index 4625fbc..046bc90 100644
--- a/qt/oracle/basic/makefile
+++ b/qt/oracle/basic/makefile
@@ -81,7 +81,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/oracle/date-time/makefile b/qt/oracle/date-time/makefile
index e5f0bbd..2dc6c38 100644
--- a/qt/oracle/date-time/makefile
+++ b/qt/oracle/date-time/makefile
@@ -81,7 +81,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/oracle/template/makefile b/qt/oracle/template/makefile
index 5f1a392..9b2863d 100644
--- a/qt/oracle/template/makefile
+++ b/qt/oracle/template/makefile
@@ -75,7 +75,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/pgsql/basic/makefile b/qt/pgsql/basic/makefile
index 7699006..eaa4fdd 100644
--- a/qt/pgsql/basic/makefile
+++ b/qt/pgsql/basic/makefile
@@ -81,7 +81,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/pgsql/date-time/makefile b/qt/pgsql/date-time/makefile
index 25a279b..8c75ef3 100644
--- a/qt/pgsql/date-time/makefile
+++ b/qt/pgsql/date-time/makefile
@@ -81,7 +81,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/pgsql/template/makefile b/qt/pgsql/template/makefile
index d22ca13..8ffa434 100644
--- a/qt/pgsql/template/makefile
+++ b/qt/pgsql/template/makefile
@@ -75,7 +75,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/sqlite/basic/makefile b/qt/sqlite/basic/makefile
index 4457e60..1689df6 100644
--- a/qt/sqlite/basic/makefile
+++ b/qt/sqlite/basic/makefile
@@ -81,7 +81,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/sqlite/date-time/makefile b/qt/sqlite/date-time/makefile
index 586ee90..a5f21ea 100644
--- a/qt/sqlite/date-time/makefile
+++ b/qt/sqlite/date-time/makefile
@@ -81,7 +81,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)
diff --git a/qt/sqlite/template/makefile b/qt/sqlite/template/makefile
index 8577e54..ee53224 100644
--- a/qt/sqlite/template/makefile
+++ b/qt/sqlite/template/makefile
@@ -75,7 +75,7 @@ $(dist):
 #
 $(test): $(driver) $(src_base)/test.std
 	$(call schema)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+	$(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \
 >$(out_base)/test.out)
 	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
 	$(call message,,rm -f $(out_base)/test.out)