From d83890c0c2c95da9e190a8f9a7ddc29cd621bef7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 3 Jun 2013 13:22:37 +0200 Subject: 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. --- .gitignore | 4 ++-- boost/common/multi-index/makefile | 2 +- boost/common/optional/makefile | 2 +- boost/common/smart-ptr/makefile | 2 +- boost/common/template/makefile | 2 +- boost/common/unordered/makefile | 2 +- boost/common/uuid/makefile | 2 +- boost/mssql/date-time/makefile | 2 +- boost/mssql/template/makefile | 2 +- boost/mysql/date-time/makefile | 2 +- boost/mysql/template/makefile | 2 +- boost/oracle/date-time/makefile | 2 +- boost/oracle/template/makefile | 2 +- boost/pgsql/date-time/makefile | 2 +- boost/pgsql/template/makefile | 2 +- boost/sqlite/date-time/makefile | 2 +- boost/sqlite/template/makefile | 2 +- build/bootstrap.make | 2 +- build/configuration-rules.make | 4 ++-- build/mssql/configure | 4 ++-- build/mysql/configure | 4 ++-- build/oracle/configure | 4 ++-- build/pgsql/configure | 4 ++-- build/sqlite/configure | 2 +- common/access/makefile | 2 +- common/auto/makefile | 2 +- common/blob/makefile | 2 +- common/callback/makefile | 2 +- common/circular/multiple/makefile | 2 +- common/circular/single/makefile | 2 +- common/composite-id/makefile | 2 +- common/composite/makefile | 2 +- common/const-member/makefile | 2 +- common/const-object/makefile | 2 +- common/container/basics/makefile | 2 +- common/container/change-tracking/makefile | 2 +- common/ctor/makefile | 2 +- common/default/makefile | 2 +- common/definition/makefile | 2 +- common/enum/makefile | 2 +- common/erase-query/makefile | 2 +- common/include/makefile | 2 +- common/index/makefile | 2 +- common/inheritance/polymorphism/makefile | 2 +- common/inheritance/reuse/makefile | 2 +- common/inheritance/transient/makefile | 2 +- common/inverse/makefile | 2 +- common/lazy-ptr/makefile | 2 +- common/lifecycle/makefile | 2 +- common/no-id/makefile | 2 +- common/optimistic/makefile | 2 +- common/pragma/makefile | 2 +- common/prepared/makefile | 2 +- common/query/array/makefile | 2 +- common/query/basics/makefile | 2 +- common/readonly/makefile | 2 +- common/relationship-query/makefile | 2 +- common/relationship/makefile | 2 +- common/schema/embedded/basics/makefile | 2 +- common/schema/embedded/order/makefile | 2 +- common/schema/namespace/makefile | 2 +- common/session/cache/makefile | 2 +- common/session/custom/makefile | 2 +- common/template/makefile | 2 +- common/threads/makefile | 2 +- common/transaction/basics/makefile | 2 +- common/transaction/callback/makefile | 2 +- common/types/makefile | 2 +- common/view/makefile | 2 +- common/virtual/makefile | 2 +- common/wrapper/makefile | 2 +- evolution/add-column/makefile | 6 +++--- evolution/add-foreign-key/makefile | 6 +++--- evolution/add-index/makefile | 6 +++--- evolution/add-table/makefile | 6 +++--- evolution/alter-column/makefile | 6 +++--- evolution/combined/makefile | 6 +++--- evolution/data/makefile | 6 +++--- evolution/drop-column/makefile | 6 +++--- evolution/drop-foreign-key/makefile | 6 +++--- evolution/drop-index/makefile | 6 +++--- evolution/drop-table/makefile | 6 +++--- evolution/embedded/makefile | 6 +++--- evolution/template/makefile | 6 +++--- evolution/version/makefile | 6 +++--- mssql/custom/makefile | 2 +- mssql/database/makefile | 2 +- mssql/native/makefile | 2 +- mssql/query/makefile | 2 +- mssql/template/makefile | 2 +- mssql/types/makefile | 2 +- mysql/custom/makefile | 2 +- mysql/database/makefile | 2 +- mysql/index/makefile | 2 +- mysql/native/makefile | 2 +- mysql/template/makefile | 2 +- mysql/truncation/makefile | 2 +- mysql/types/makefile | 2 +- oracle/custom/makefile | 2 +- oracle/database/makefile | 2 +- oracle/native/makefile | 2 +- oracle/template/makefile | 2 +- oracle/types/makefile | 2 +- pgsql/custom/makefile | 2 +- pgsql/database/makefile | 2 +- pgsql/index/makefile | 2 +- pgsql/native/makefile | 2 +- pgsql/template/makefile | 2 +- pgsql/truncation/makefile | 2 +- pgsql/types/makefile | 2 +- qt/common/basic/makefile | 2 +- qt/common/containers/basics/makefile | 2 +- qt/common/containers/change-tracking/makefile | 2 +- qt/common/smart-ptr/makefile | 2 +- qt/common/template/makefile | 2 +- qt/mssql/basic/makefile | 2 +- qt/mssql/date-time/makefile | 2 +- qt/mssql/template/makefile | 2 +- qt/mysql/basic/makefile | 2 +- qt/mysql/date-time/makefile | 2 +- qt/mysql/template/makefile | 2 +- qt/oracle/basic/makefile | 2 +- qt/oracle/date-time/makefile | 2 +- qt/oracle/template/makefile | 2 +- qt/pgsql/basic/makefile | 2 +- qt/pgsql/date-time/makefile | 2 +- qt/pgsql/template/makefile | 2 +- qt/sqlite/basic/makefile | 2 +- qt/sqlite/date-time/makefile | 2 +- qt/sqlite/template/makefile | 2 +- sqlite/custom/makefile | 2 +- sqlite/database/makefile | 2 +- sqlite/native/makefile | 2 +- sqlite/template/makefile | 2 +- sqlite/truncation/makefile | 2 +- sqlite/types/makefile | 2 +- 136 files changed, 170 insertions(+), 170 deletions(-) diff --git a/.gitignore b/.gitignore index 15db638..405cbcc 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,8 @@ # Generated build system files. # *-dynamic.make -build/db.options -build/db-driver +build/*.options +build/*-driver # Generated .gitignore files. # diff --git a/boost/common/multi-index/makefile b/boost/common/multi-index/makefile index de891e6..bde0ebb 100644 --- a/boost/common/multi-index/makefile +++ b/boost/common/multi-index/makefile @@ -78,7 +78,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/boost/common/optional/makefile b/boost/common/optional/makefile index f46c931..6dc5c31 100644 --- a/boost/common/optional/makefile +++ b/boost/common/optional/makefile @@ -78,7 +78,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/boost/common/smart-ptr/makefile b/boost/common/smart-ptr/makefile index d183e0b..9225155 100644 --- a/boost/common/smart-ptr/makefile +++ b/boost/common/smart-ptr/makefile @@ -78,7 +78,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/boost/common/template/makefile b/boost/common/template/makefile index a3cf2c7..133177e 100644 --- a/boost/common/template/makefile +++ b/boost/common/template/makefile @@ -78,7 +78,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/boost/common/unordered/makefile b/boost/common/unordered/makefile index 471944b..c88a8ec 100644 --- a/boost/common/unordered/makefile +++ b/boost/common/unordered/makefile @@ -78,7 +78,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/boost/common/uuid/makefile b/boost/common/uuid/makefile index 9379b6a..7d39469 100644 --- a/boost/common/uuid/makefile +++ b/boost/common/uuid/makefile @@ -78,7 +78,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/boost/mssql/date-time/makefile b/boost/mssql/date-time/makefile index a085b11..f7ce059 100644 --- a/boost/mssql/date-time/makefile +++ b/boost/mssql/date-time/makefile @@ -80,7 +80,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/boost/mssql/template/makefile b/boost/mssql/template/makefile index 1d7c4c8..fa9149c 100644 --- a/boost/mssql/template/makefile +++ b/boost/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/boost/mysql/date-time/makefile b/boost/mysql/date-time/makefile index e136fcf..401e5cc 100644 --- a/boost/mysql/date-time/makefile +++ b/boost/mysql/date-time/makefile @@ -79,7 +79,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/boost/mysql/template/makefile b/boost/mysql/template/makefile index 2ef239a..33b2440 100644 --- a/boost/mysql/template/makefile +++ b/boost/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/boost/oracle/date-time/makefile b/boost/oracle/date-time/makefile index 4c7b3fc..9c804c0 100644 --- a/boost/oracle/date-time/makefile +++ b/boost/oracle/date-time/makefile @@ -80,7 +80,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/boost/oracle/template/makefile b/boost/oracle/template/makefile index 50b6be4..ca488c0 100644 --- a/boost/oracle/template/makefile +++ b/boost/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/boost/pgsql/date-time/makefile b/boost/pgsql/date-time/makefile index a60f648..a899d40 100644 --- a/boost/pgsql/date-time/makefile +++ b/boost/pgsql/date-time/makefile @@ -79,7 +79,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/boost/pgsql/template/makefile b/boost/pgsql/template/makefile index c27ffad..1c63146 100644 --- a/boost/pgsql/template/makefile +++ b/boost/pgsql/template/makefile @@ -79,7 +79,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/boost/sqlite/date-time/makefile b/boost/sqlite/date-time/makefile index a61f077..732cb09 100644 --- a/boost/sqlite/date-time/makefile +++ b/boost/sqlite/date-time/makefile @@ -79,7 +79,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/boost/sqlite/template/makefile b/boost/sqlite/template/makefile index 1001473..77500d2 100644 --- a/boost/sqlite/template/makefile +++ b/boost/sqlite/template/makefile @@ -79,7 +79,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/build/bootstrap.make b/build/bootstrap.make index cef108e..178f2aa 100644 --- a/build/bootstrap.make +++ b/build/bootstrap.make @@ -52,7 +52,7 @@ $(out_base)/.dist: export odb_header_stem := test # ifeq ($(filter $(db_id),sqlite),) $(out_base)/.test: schema-body = \ -$(call message,sql $$1,$(dcf_root)/db-driver $$1,$1)$(literal_newline)$(literal_tab) +$(call message,sql $$1,$(dcf_root)/$(db_id)-driver $$1,$1)$(literal_newline)$(literal_tab) $(out_base)/.test: schema = \ $(foreach s,$(if $1,$1,$(out_base)/test.sql),$(call schema-body,$s))@: endif diff --git a/build/configuration-rules.make b/build/configuration-rules.make index 5576495..fb9f51f 100644 --- a/build/configuration-rules.make +++ b/build/configuration-rules.make @@ -9,8 +9,8 @@ ifndef %foreign% disfigure:: $(call message,rm $$1,rm -f $$1,$(dcf_root)/configuration-dynamic.make) - $(call message,rm $$1,rm -f $$1,$(dcf_root)/db.options) - $(call message,rm $$1,rm -f $$1,$(dcf_root)/db-driver) + $(call message,rm $$1,rm -f $$1,$(dcf_root)/*.options) + $(call message,rm $$1,rm -f $$1,$(dcf_root)/*-driver) endif diff --git a/build/mssql/configure b/build/mssql/configure index 33fbf7b..9603c10 100755 --- a/build/mssql/configure +++ b/build/mssql/configure @@ -39,8 +39,8 @@ $echo server=`read_value ""` -opt=$dcf_root/db.options -drv=$dcf_root/db-driver +opt=$dcf_root/mssql.options +drv=$dcf_root/mssql-driver echo "--user '$user'" >$opt echo "--password '$passwd'" >>$opt diff --git a/build/mysql/configure b/build/mysql/configure index afbf849..704a96f 100755 --- a/build/mysql/configure +++ b/build/mysql/configure @@ -53,8 +53,8 @@ $echo socket=`read_value "NULL"` -opt=$dcf_root/db.options -drv=$dcf_root/db-driver +opt=$dcf_root/mysql.options +drv=$dcf_root/mysql-driver echo "--user '$user'" >$opt diff --git a/build/oracle/configure b/build/oracle/configure index bcd3c6c..0366b76 100755 --- a/build/oracle/configure +++ b/build/oracle/configure @@ -55,8 +55,8 @@ $echo service=`read_value ""` -opt=$dcf_root/db.options -drv=$dcf_root/db-driver +opt=$dcf_root/oracle.options +drv=$dcf_root/oracle-driver if [ -n "$user" ]; then echo "--user '$user'" >$opt diff --git a/build/pgsql/configure b/build/pgsql/configure index 2e78a13..d129b54 100755 --- a/build/pgsql/configure +++ b/build/pgsql/configure @@ -44,8 +44,8 @@ $echo port=`read_value ""` -opt=$dcf_root/db.options -drv=$dcf_root/db-driver +opt=$dcf_root/pgsql.options +drv=$dcf_root/pgsql-driver echo "--user '$user'" >$opt echo "--database '$db'" >>$opt diff --git a/build/sqlite/configure b/build/sqlite/configure index 75a4773..a454df9 100755 --- a/build/sqlite/configure +++ b/build/sqlite/configure @@ -16,6 +16,6 @@ $echo db=`read_value "/tmp/odb-test.db"` -opt=$dcf_root/db.options +opt=$dcf_root/sqlite.options echo "--database '$db'" >$opt diff --git a/common/access/makefile b/common/access/makefile index d3d4438..7a8a86a 100644 --- a/common/access/makefile +++ b/common/access/makefile @@ -68,7 +68,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/common/auto/makefile b/common/auto/makefile index baaf756..c317894 100644 --- a/common/auto/makefile +++ b/common/auto/makefile @@ -67,7 +67,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/common/blob/makefile b/common/blob/makefile index 82d6523..ee9785f 100644 --- a/common/blob/makefile +++ b/common/blob/makefile @@ -67,7 +67,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/common/callback/makefile b/common/callback/makefile index 7f0e8aa..f7b0ab6 100644 --- a/common/callback/makefile +++ b/common/callback/makefile @@ -67,7 +67,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/common/circular/multiple/makefile b/common/circular/multiple/makefile index 5093f56..026d6db 100644 --- a/common/circular/multiple/makefile +++ b/common/circular/multiple/makefile @@ -71,7 +71,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/common/circular/single/makefile b/common/circular/single/makefile index 81c01a7..e5f645e 100644 --- a/common/circular/single/makefile +++ b/common/circular/single/makefile @@ -67,7 +67,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/common/composite-id/makefile b/common/composite-id/makefile index 3c557ed..1b080e3 100644 --- a/common/composite-id/makefile +++ b/common/composite-id/makefile @@ -67,7 +67,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/common/composite/makefile b/common/composite/makefile index 92da67f..1892ba1 100644 --- a/common/composite/makefile +++ b/common/composite/makefile @@ -67,7 +67,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/common/const-member/makefile b/common/const-member/makefile index 8e1780e..83a398d 100644 --- a/common/const-member/makefile +++ b/common/const-member/makefile @@ -67,7 +67,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/common/const-object/makefile b/common/const-object/makefile index 38881fa..043ab76 100644 --- a/common/const-object/makefile +++ b/common/const-object/makefile @@ -67,7 +67,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/common/container/basics/makefile b/common/container/basics/makefile index 29d70bb..baddb9f 100644 --- a/common/container/basics/makefile +++ b/common/container/basics/makefile @@ -67,7 +67,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/common/container/change-tracking/makefile b/common/container/change-tracking/makefile index 9135405..b24f8ea 100644 --- a/common/container/change-tracking/makefile +++ b/common/container/change-tracking/makefile @@ -67,7 +67,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/common/ctor/makefile b/common/ctor/makefile index 1290cb2..67f5656 100644 --- a/common/ctor/makefile +++ b/common/ctor/makefile @@ -67,7 +67,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/common/default/makefile b/common/default/makefile index 82e268f..27ad049 100644 --- a/common/default/makefile +++ b/common/default/makefile @@ -67,7 +67,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/common/definition/makefile b/common/definition/makefile index a7c87e6..837d5d6 100644 --- a/common/definition/makefile +++ b/common/definition/makefile @@ -72,7 +72,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/common/enum/makefile b/common/enum/makefile index ce2e6c2..466498f 100644 --- a/common/enum/makefile +++ b/common/enum/makefile @@ -67,7 +67,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/common/erase-query/makefile b/common/erase-query/makefile index 7856090..378103f 100644 --- a/common/erase-query/makefile +++ b/common/erase-query/makefile @@ -67,7 +67,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/common/include/makefile b/common/include/makefile index 3a74738..19d2705 100644 --- a/common/include/makefile +++ b/common/include/makefile @@ -53,7 +53,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/common/index/makefile b/common/index/makefile index c412619..82e0835 100644 --- a/common/index/makefile +++ b/common/index/makefile @@ -67,7 +67,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/common/inheritance/polymorphism/makefile b/common/inheritance/polymorphism/makefile index d250541..2be6810 100644 --- a/common/inheritance/polymorphism/makefile +++ b/common/inheritance/polymorphism/makefile @@ -71,7 +71,7 @@ $(dist): $(test): schemas := $(addprefix $(out_base)/,$(odb_hdr:.hxx=.sql)) $(test): $(driver) $(src_base)/test.std $(call schema,$(schemas)) - $(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/common/inheritance/reuse/makefile b/common/inheritance/reuse/makefile index 6541680..f116b0d 100644 --- a/common/inheritance/reuse/makefile +++ b/common/inheritance/reuse/makefile @@ -67,7 +67,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/common/inheritance/transient/makefile b/common/inheritance/transient/makefile index 4e1ad99..65b1afa 100644 --- a/common/inheritance/transient/makefile +++ b/common/inheritance/transient/makefile @@ -67,7 +67,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/common/inverse/makefile b/common/inverse/makefile index ed5f1f9..6089d8d 100644 --- a/common/inverse/makefile +++ b/common/inverse/makefile @@ -67,7 +67,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/common/lazy-ptr/makefile b/common/lazy-ptr/makefile index e4424ec..b5bafcf 100644 --- a/common/lazy-ptr/makefile +++ b/common/lazy-ptr/makefile @@ -67,7 +67,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/common/lifecycle/makefile b/common/lifecycle/makefile index 0959a83..4caff60 100644 --- a/common/lifecycle/makefile +++ b/common/lifecycle/makefile @@ -67,7 +67,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/common/no-id/makefile b/common/no-id/makefile index 3c4a4aa..d56c120 100644 --- a/common/no-id/makefile +++ b/common/no-id/makefile @@ -67,7 +67,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/common/optimistic/makefile b/common/optimistic/makefile index 57836d3..9b5f06a 100644 --- a/common/optimistic/makefile +++ b/common/optimistic/makefile @@ -67,7 +67,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/common/pragma/makefile b/common/pragma/makefile index 4ce8294..563809c 100644 --- a/common/pragma/makefile +++ b/common/pragma/makefile @@ -66,7 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/common/prepared/makefile b/common/prepared/makefile index 09a27cb..4c2bf28 100644 --- a/common/prepared/makefile +++ b/common/prepared/makefile @@ -67,7 +67,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/common/query/array/makefile b/common/query/array/makefile index 296e9a2..0d65398 100644 --- a/common/query/array/makefile +++ b/common/query/array/makefile @@ -68,7 +68,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/common/query/basics/makefile b/common/query/basics/makefile index e5ae0d1..2952b21 100644 --- a/common/query/basics/makefile +++ b/common/query/basics/makefile @@ -67,7 +67,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/common/readonly/makefile b/common/readonly/makefile index f0a0fcc..adde950 100644 --- a/common/readonly/makefile +++ b/common/readonly/makefile @@ -67,7 +67,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/common/relationship-query/makefile b/common/relationship-query/makefile index c8157c5..164b0f0 100644 --- a/common/relationship-query/makefile +++ b/common/relationship-query/makefile @@ -67,7 +67,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/common/relationship/makefile b/common/relationship/makefile index 9a8ce7d..4babd5e 100644 --- a/common/relationship/makefile +++ b/common/relationship/makefile @@ -67,7 +67,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/common/schema/embedded/basics/makefile b/common/schema/embedded/basics/makefile index 2feb937..7989195 100644 --- a/common/schema/embedded/basics/makefile +++ b/common/schema/embedded/basics/makefile @@ -66,7 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/common/schema/embedded/order/makefile b/common/schema/embedded/order/makefile index 941e183..e8d840d 100644 --- a/common/schema/embedded/order/makefile +++ b/common/schema/embedded/order/makefile @@ -71,7 +71,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/common/schema/namespace/makefile b/common/schema/namespace/makefile index 370d6ca..c1157c9 100644 --- a/common/schema/namespace/makefile +++ b/common/schema/namespace/makefile @@ -67,7 +67,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/common/session/cache/makefile b/common/session/cache/makefile index 5309cd9..c26b394 100644 --- a/common/session/cache/makefile +++ b/common/session/cache/makefile @@ -67,7 +67,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/common/session/custom/makefile b/common/session/custom/makefile index 89d2296..e822b7a 100644 --- a/common/session/custom/makefile +++ b/common/session/custom/makefile @@ -69,7 +69,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/common/template/makefile b/common/template/makefile index e589b35..63768df 100644 --- a/common/template/makefile +++ b/common/template/makefile @@ -67,7 +67,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/common/threads/makefile b/common/threads/makefile index 02dc303..cfd0e3f 100644 --- a/common/threads/makefile +++ b/common/threads/makefile @@ -67,7 +67,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/common/transaction/basics/makefile b/common/transaction/basics/makefile index 23932d1..b384d47 100644 --- a/common/transaction/basics/makefile +++ b/common/transaction/basics/makefile @@ -48,7 +48,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/common/transaction/callback/makefile b/common/transaction/callback/makefile index 2ccadcd..f4ed18b 100644 --- a/common/transaction/callback/makefile +++ b/common/transaction/callback/makefile @@ -48,7 +48,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/common/types/makefile b/common/types/makefile index 54c6ba3..ec58785 100644 --- a/common/types/makefile +++ b/common/types/makefile @@ -65,7 +65,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/common/view/makefile b/common/view/makefile index 097ae7d..bc74e97 100644 --- a/common/view/makefile +++ b/common/view/makefile @@ -67,7 +67,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/common/virtual/makefile b/common/virtual/makefile index c7d5f3f..a98a69d 100644 --- a/common/virtual/makefile +++ b/common/virtual/makefile @@ -67,7 +67,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/common/wrapper/makefile b/common/wrapper/makefile index 5e7e5ff..8511bd9 100644 --- a/common/wrapper/makefile +++ b/common/wrapper/makefile @@ -67,7 +67,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/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. # diff --git a/mssql/custom/makefile b/mssql/custom/makefile index 03dfd7d..e9fa371 100644 --- a/mssql/custom/makefile +++ b/mssql/custom/makefile @@ -68,7 +68,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/mssql/database/makefile b/mssql/database/makefile index c9e2c59..2e64258 100644 --- a/mssql/database/makefile +++ b/mssql/database/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/mssql/native/makefile b/mssql/native/makefile index 17ff8a5..ac4e3ac 100644 --- a/mssql/native/makefile +++ b/mssql/native/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/mssql/query/makefile b/mssql/query/makefile index 98d1f68..166482f 100644 --- a/mssql/query/makefile +++ b/mssql/query/makefile @@ -66,7 +66,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/mssql/template/makefile b/mssql/template/makefile index 2218018..a62384c 100644 --- a/mssql/template/makefile +++ b/mssql/template/makefile @@ -65,7 +65,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/mssql/types/makefile b/mssql/types/makefile index eeb9d8b..247d7a0 100644 --- a/mssql/types/makefile +++ b/mssql/types/makefile @@ -67,7 +67,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/mysql/custom/makefile b/mysql/custom/makefile index 91c0a89..2b8afb8 100644 --- a/mysql/custom/makefile +++ b/mysql/custom/makefile @@ -68,7 +68,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/mysql/database/makefile b/mysql/database/makefile index ef3e673..7ff07f0 100644 --- a/mysql/database/makefile +++ b/mysql/database/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/mysql/index/makefile b/mysql/index/makefile index d3e7740..54b4974 100644 --- a/mysql/index/makefile +++ b/mysql/index/makefile @@ -65,7 +65,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/mysql/native/makefile b/mysql/native/makefile index ce0a283..2e654ba 100644 --- a/mysql/native/makefile +++ b/mysql/native/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/mysql/template/makefile b/mysql/template/makefile index c4afa1e..0a6c880 100644 --- a/mysql/template/makefile +++ b/mysql/template/makefile @@ -65,7 +65,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/mysql/truncation/makefile b/mysql/truncation/makefile index 0825d67..0aa9bf6 100644 --- a/mysql/truncation/makefile +++ b/mysql/truncation/makefile @@ -65,7 +65,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/mysql/types/makefile b/mysql/types/makefile index ef1fe9f..61d3898 100644 --- a/mysql/types/makefile +++ b/mysql/types/makefile @@ -67,7 +67,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/oracle/custom/makefile b/oracle/custom/makefile index 866b4e2..dc9af00 100644 --- a/oracle/custom/makefile +++ b/oracle/custom/makefile @@ -68,7 +68,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/oracle/database/makefile b/oracle/database/makefile index 6b0e4af..5873734 100644 --- a/oracle/database/makefile +++ b/oracle/database/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/oracle/native/makefile b/oracle/native/makefile index 5137a8a..80d2fd1 100644 --- a/oracle/native/makefile +++ b/oracle/native/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/oracle/template/makefile b/oracle/template/makefile index 19e8a34..5106239 100644 --- a/oracle/template/makefile +++ b/oracle/template/makefile @@ -65,7 +65,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/oracle/types/makefile b/oracle/types/makefile index d303cea..448bcc1 100644 --- a/oracle/types/makefile +++ b/oracle/types/makefile @@ -67,7 +67,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/pgsql/custom/makefile b/pgsql/custom/makefile index 27a4a34..f934bdb 100644 --- a/pgsql/custom/makefile +++ b/pgsql/custom/makefile @@ -68,7 +68,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/pgsql/database/makefile b/pgsql/database/makefile index f112d4d..585aaed 100644 --- a/pgsql/database/makefile +++ b/pgsql/database/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/pgsql/index/makefile b/pgsql/index/makefile index 89b6f09..a97bd27 100644 --- a/pgsql/index/makefile +++ b/pgsql/index/makefile @@ -65,7 +65,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/pgsql/native/makefile b/pgsql/native/makefile index 8f64144..9e625d7 100644 --- a/pgsql/native/makefile +++ b/pgsql/native/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/pgsql/template/makefile b/pgsql/template/makefile index f556c26..3367c4a 100644 --- a/pgsql/template/makefile +++ b/pgsql/template/makefile @@ -65,7 +65,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/pgsql/truncation/makefile b/pgsql/truncation/makefile index 055aa6f..5f8d286 100644 --- a/pgsql/truncation/makefile +++ b/pgsql/truncation/makefile @@ -65,7 +65,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/pgsql/types/makefile b/pgsql/types/makefile index eb173ec..f20ae1e 100644 --- a/pgsql/types/makefile +++ b/pgsql/types/makefile @@ -67,7 +67,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/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) diff --git a/sqlite/custom/makefile b/sqlite/custom/makefile index ffc1836..132d767 100644 --- a/sqlite/custom/makefile +++ b/sqlite/custom/makefile @@ -65,7 +65,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/sqlite/database/makefile b/sqlite/database/makefile index 6f5c1c8..66051e4 100644 --- a/sqlite/database/makefile +++ b/sqlite/database/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/sqlite/native/makefile b/sqlite/native/makefile index b9418ef..5c31952 100644 --- a/sqlite/native/makefile +++ b/sqlite/native/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(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/sqlite/template/makefile b/sqlite/template/makefile index a9453d4..00f3770 100644 --- a/sqlite/template/makefile +++ b/sqlite/template/makefile @@ -65,7 +65,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/sqlite/truncation/makefile b/sqlite/truncation/makefile index ccc80fa..020e298 100644 --- a/sqlite/truncation/makefile +++ b/sqlite/truncation/makefile @@ -65,7 +65,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/sqlite/types/makefile b/sqlite/types/makefile index a588db4..f4abc56 100644 --- a/sqlite/types/makefile +++ b/sqlite/types/makefile @@ -67,7 +67,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) -- cgit v1.1