Handle --database option directly in automake and VC++ projects

18 files changed, 54 insertions, 40 deletions

diff --git a/evolution/add-column/makefile b/evolution/add-column/makefile
index a49ff52..7da8b71 100644
--- a/evolution/add-column/makefile
+++ b/evolution/add-column/makefile
@@ -45,8 +45,9 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_add_c_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -74,7 +75,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/add-foreign-key/makefile b/evolution/add-foreign-key/makefile
index d3c9873..3446e5b 100644
--- a/evolution/add-foreign-key/makefile
+++ b/evolution/add-foreign-key/makefile
@@ -45,9 +45,10 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --fkeys-deferrable-mode not_deferrable \
 --table-prefix evo_add_fk_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -75,7 +76,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/add-index/makefile b/evolution/add-index/makefile
index c46222f..50a6673 100644
--- a/evolution/add-index/makefile
+++ b/evolution/add-index/makefile
@@ -45,8 +45,9 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_add_i_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -74,7 +75,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/add-table/makefile b/evolution/add-table/makefile
index 4d92861..a57e56e 100644
--- a/evolution/add-table/makefile
+++ b/evolution/add-table/makefile
@@ -45,8 +45,9 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_add_t_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -74,7 +75,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/alter-column/makefile b/evolution/alter-column/makefile
index 3c198a2..998c915 100644
--- a/evolution/alter-column/makefile
+++ b/evolution/alter-column/makefile
@@ -45,8 +45,9 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_alter_c_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -74,7 +75,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/combined/makefile b/evolution/combined/makefile
index b243f60..33c5176 100644
--- a/evolution/combined/makefile
+++ b/evolution/combined/makefile
@@ -45,8 +45,9 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_comb_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -74,7 +75,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/data/makefile b/evolution/data/makefile
index ea711ed..6787527 100644
--- a/evolution/data/makefile
+++ b/evolution/data/makefile
@@ -43,8 +43,9 @@ gen  := $(gen1) $(gen2) $(gen3)
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_data_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -72,7 +73,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/drop-column/makefile b/evolution/drop-column/makefile
index 6f6cc6b..26b31ac 100644
--- a/evolution/drop-column/makefile
+++ b/evolution/drop-column/makefile
@@ -45,8 +45,9 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_drop_c_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -74,7 +75,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/drop-foreign-key/makefile b/evolution/drop-foreign-key/makefile
index b22ce9d..78d1602 100644
--- a/evolution/drop-foreign-key/makefile
+++ b/evolution/drop-foreign-key/makefile
@@ -45,9 +45,10 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --fkeys-deferrable-mode not_deferrable \
 --table-prefix evo_drop_fk_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -75,7 +76,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/drop-index/makefile b/evolution/drop-index/makefile
index 072e830..2e849c1 100644
--- a/evolution/drop-index/makefile
+++ b/evolution/drop-index/makefile
@@ -45,8 +45,9 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_drop_i_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -74,7 +75,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/drop-table/makefile b/evolution/drop-table/makefile
index 9165559..ff6014f 100644
--- a/evolution/drop-table/makefile
+++ b/evolution/drop-table/makefile
@@ -45,8 +45,9 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_drop_t_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -74,7 +75,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/embedded/makefile b/evolution/embedded/makefile
index e8f5892..8503ce7 100644
--- a/evolution/embedded/makefile
+++ b/evolution/embedded/makefile
@@ -43,8 +43,9 @@ gen  := $(gen1) $(gen2) $(gen3)
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --schema-format embedded --at-once --table-prefix evo_embedded_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -72,7 +73,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/template/Makefile.am b/evolution/template/Makefile.am
index 2d71bc3..b81650d 100644
--- a/evolution/template/Makefile.am
+++ b/evolution/template/Makefile.am
@@ -29,7 +29,7 @@ BUILT_SOURCES = test1-odb.hxx
 CLEANFILES = test1-odb.hxx test1-odb.ixx test1-odb.cxx test1.sql model.xml
 
 test1-odb.hxx: test1.hxx
-	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS)  __value__(odb_options1) --changelog model.xml $<
+	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) --database @database@ __value__(odb_options1) --changelog model.xml $<
 
 # test2.hxx
 #
@@ -39,7 +39,7 @@ BUILT_SOURCES = test2-odb.hxx
 CLEANFILES = test2-odb.hxx test2-odb.ixx test2-odb.cxx test2.sql
 
 test2-odb.hxx: test2.hxx
-	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS)  __value__(odb_options2) --changelog model.xml $<
+	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) --database @database@ __value__(odb_options2) --changelog model.xml $<
 
 # test3.hxx
 #
@@ -50,7 +50,7 @@ CLEANFILES += test3-odb.hxx test3-odb.ixx test3-odb.cxx test3.sql \
 test3-002-pre.sql test3-002-post.sql test3-003-pre.sql test3-003-post.sql
 
 test3-odb.hxx: test3.hxx
-	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS)  __value__(odb_options3) --changelog model.xml $<
+	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) --database @database@ __value__(odb_options3) --changelog model.xml $<
 
 # Make sure testN.hxx are compiled serially since they share the
 # changelog. Also add dependency on model.hxx
diff --git a/evolution/template/makefile b/evolution/template/makefile
index 9df8125..88bf49a 100644
--- a/evolution/template/makefile
+++ b/evolution/template/makefile
@@ -45,8 +45,9 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_template_ #@@ CHANGE THIS
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -74,7 +75,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
diff --git a/evolution/template/template-vc10.vcxproj b/evolution/template/template-vc10.vcxproj
index 70b8687..a98b681 100644
--- a/evolution/template/template-vc10.vcxproj
+++ b/evolution/template/template-vc10.vcxproj
@@ -158,19 +158,19 @@
 __custom_build_entry__(
 test1.hxx,
 odb test1.hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options1), @database@, __value__(database)) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test1.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options1) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test1.hxx,
 test1-odb.hxx;test1-odb.ixx;test1-odb.cxx;test1.sql;model.xml,
 model.hxx)
 __custom_build_entry__(
 test2.hxx,
 odb test2.hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options2), @database@, __value__(database)) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test2.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options2) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test2.hxx,
 test2-odb.hxx;test2-odb.ixx;test2-odb.cxx;test2.sql;model.xml,
 test1-odb.hxx;model.hxx)
 __custom_build_entry__(
 test3.hxx,
 odb test3.hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options3), @database@, __value__(database)) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test3.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options3) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test3.hxx,
 test3-odb.hxx;test3-odb.ixx;test3-odb.cxx;test3.sql;test3-002-pre.sql;test3-002-post.sql;test3-003-pre.sql;test3-003-post.sql,
 test2-odb.hxx;model.hxx)
   </ItemGroup>
diff --git a/evolution/template/template-vc11.vcxproj b/evolution/template/template-vc11.vcxproj
index 5895a46..0bdafd9 100644
--- a/evolution/template/template-vc11.vcxproj
+++ b/evolution/template/template-vc11.vcxproj
@@ -162,19 +162,19 @@
 __custom_build_entry__(
 test1.hxx,
 odb test1.hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options1), @database@, __value__(database)) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1700 -I$(SolutionDir)\..\libcommon)) test1.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options1) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1700 -I$(SolutionDir)\..\libcommon)) test1.hxx,
 test1-odb.hxx;test1-odb.ixx;test1-odb.cxx;test1.sql;model.xml,
 model.hxx)
 __custom_build_entry__(
 test2.hxx,
 odb test2.hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options2), @database@, __value__(database)) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1700 -I$(SolutionDir)\..\libcommon)) test2.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options2) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1700 -I$(SolutionDir)\..\libcommon)) test2.hxx,
 test2-odb.hxx;test2-odb.ixx;test2-odb.cxx;test2.sql;model.xml,
 test1-odb.hxx;model.hxx)
 __custom_build_entry__(
 test3.hxx,
 odb test3.hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options3), @database@, __value__(database)) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1700 -I$(SolutionDir)\..\libcommon)) test3.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options3) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1700 -I$(SolutionDir)\..\libcommon)) test3.hxx,
 test3-odb.hxx;test3-odb.ixx;test3-odb.cxx;test3.sql;test3-002-pre.sql;test3-002-post.sql;test3-003-pre.sql;test3-003-post.sql,
 test2-odb.hxx;model.hxx)
   </ItemGroup>
diff --git a/evolution/template/template-vc9.vcproj b/evolution/template/template-vc9.vcproj
index 4c9b465..536f154 100644
--- a/evolution/template/template-vc9.vcproj
+++ b/evolution/template/template-vc9.vcproj
@@ -350,7 +350,7 @@ __source_entries__(extra_sources)
 __file_entry_custom_build__(
 test1.hxx,
 odb test1.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options1), @database@, __value__(database)) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test1.hxx,
+odb.exe --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options1) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test1.hxx,
 test1-odb.hxx;test1-odb.ixx;test1-odb.cxx;test1.sql;model.xml,
 model.hxx)
 __file_entry__(test1-odb.hxx)
@@ -358,7 +358,7 @@ __file_entry__(test1-odb.ixx)
 __file_entry_custom_build__(
 test2.hxx,
 odb test2.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options2), @database@, __value__(database)) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test2.hxx,
+odb.exe --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options2) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test2.hxx,
 test2-odb.hxx;test2-odb.ixx;test2-odb.cxx;test2.sql;model.xml,
 test1-odb.hxx;model.hxx)
 __file_entry__(test2-odb.hxx)
@@ -366,7 +366,7 @@ __file_entry__(test2-odb.ixx)
 __file_entry_custom_build__(
 test3.hxx,
 odb test3.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options3), @database@, __value__(database)) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test3.hxx,
+odb.exe --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options3) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test3.hxx,
 test3-odb.hxx;test3-odb.ixx;test3-odb.cxx;test3.sql;test3-002-pre.sql;test3-002-post.sql;test3-003-pre.sql;test3-003-post.sql,
 test2-odb.hxx;model.hxx)
 __file_entry__(test3-odb.hxx)
diff --git a/evolution/version/makefile b/evolution/version/makefile
index fa365d6..bcb4819 100644
--- a/evolution/version/makefile
+++ b/evolution/version/makefile
@@ -45,8 +45,9 @@ test3-003-pre.sql test3-003-post.sql
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --at-once --table-prefix evo_version_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -74,7 +75,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx