Make tests use unique table prefixes

10 files changed, 15 insertions, 11 deletions

diff --git a/boost/common/optional/makefile b/boost/common/optional/makefile
index 1b4bf2b..6145a2d 100644
--- a/boost/common/optional/makefile
+++ b/boost/common/optional/makefile
@@ -1,4 +1,4 @@
-# file      : boost/common/template/makefile
+# file      : boost/common/optional/makefile
 # author    : Boris Kolpackov <boris@codesynthesis.com>
 # copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
@@ -45,7 +45,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/optional --generate-schema --generate-query
+--profile boost/optional --generate-schema --generate-query \
+--table-prefix boost_common_optional_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.l.cpp-options)
diff --git a/boost/common/smart-ptr/makefile b/boost/common/smart-ptr/makefile
index 45983c9..6d875db 100644
--- a/boost/common/smart-ptr/makefile
+++ b/boost/common/smart-ptr/makefile
@@ -45,7 +45,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/smart-ptr --generate-schema
+--profile boost/smart-ptr --generate-schema \
+--table-prefix boost_common_smart_ptr_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.l.cpp-options)
diff --git a/boost/common/template/makefile b/boost/common/template/makefile
index 85000d3..eb2c5f6 100644
--- a/boost/common/template/makefile
+++ b/boost/common/template/makefile
@@ -45,7 +45,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/version --generate-schema # CHANGE boost/version
+--profile boost/version --generate-schema \
+--table-prefix boost_common_template_ #@@ CHANGE table prefix, boost/version
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.l.cpp-options)
diff --git a/boost/common/unordered/makefile b/boost/common/unordered/makefile
index f52e2a1..0dd69de 100644
--- a/boost/common/unordered/makefile
+++ b/boost/common/unordered/makefile
@@ -45,7 +45,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/unordered --generate-schema
+--profile boost/unordered --generate-schema \
+--table-prefix boost_common_unordered_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.l.cpp-options)
diff --git a/boost/mysql/date-time/makefile b/boost/mysql/date-time/makefile
index e80cf0b..204743e 100644
--- a/boost/mysql/date-time/makefile
+++ b/boost/mysql/date-time/makefile
@@ -49,7 +49,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database mysql --profile boost/date-time \
---generate-schema
+--generate-schema --table-prefix boost_mysql_date_time_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.l.cpp-options)
diff --git a/boost/mysql/template/makefile b/boost/mysql/template/makefile
index 1e030fb..0cba62b 100644
--- a/boost/mysql/template/makefile
+++ b/boost/mysql/template/makefile
@@ -45,7 +45,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database mysql --profile boost \
---generate-schema
+--generate-schema --table-prefix boost_mysql_template_ #@@ CHANGE THIS
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.l.cpp-options)
diff --git a/boost/pgsql/date-time/makefile b/boost/pgsql/date-time/makefile
index 74e2093..3e64e60 100644
--- a/boost/pgsql/date-time/makefile
+++ b/boost/pgsql/date-time/makefile
@@ -49,7 +49,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database pgsql --profile boost/date-time \
---generate-schema
+--generate-schema --table-prefix boost_pgsql_date_time_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.l.cpp-options)
diff --git a/boost/pgsql/template/makefile b/boost/pgsql/template/makefile
index 0d62ab6..986926b 100644
--- a/boost/pgsql/template/makefile
+++ b/boost/pgsql/template/makefile
@@ -49,7 +49,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database pgsql --profile boost \
---generate-schema
+--generate-schema --table-prefix boost_pgsql_template_ #@@ CHANGE THIS
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.l.cpp-options)
diff --git a/boost/sqlite/date-time/makefile b/boost/sqlite/date-time/makefile
index 84f4924..1f87856 100644
--- a/boost/sqlite/date-time/makefile
+++ b/boost/sqlite/date-time/makefile
@@ -49,7 +49,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database sqlite --profile boost/date-time \
---generate-schema
+--generate-schema --table-prefix boost_sqlite_date_time_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.l.cpp-options)
diff --git a/boost/sqlite/template/makefile b/boost/sqlite/template/makefile
index 13f7699..9c107ff 100644
--- a/boost/sqlite/template/makefile
+++ b/boost/sqlite/template/makefile
@@ -49,7 +49,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database sqlite --profile boost \
---generate-schema
+--generate-schema --table-prefix boost_sqlite_template_ #@@ CHANGE THIS
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.l.cpp-options)