From ff3950866c0f756a5b6f379b9f95f01fff4a9ec7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 24 Aug 2011 17:13:55 +0200 Subject: Make tests use unique table prefixes --- qt/common/containers/makefile | 3 ++- qt/common/smart-ptr/makefile | 2 +- qt/common/template/makefile | 3 ++- qt/mysql/basic/makefile | 4 ++-- qt/mysql/date-time/makefile | 2 +- qt/mysql/template/makefile | 2 +- qt/pgsql/basic/makefile | 4 ++-- qt/pgsql/date-time/makefile | 2 +- qt/pgsql/template/makefile | 2 +- qt/sqlite/basic/makefile | 4 ++-- qt/sqlite/date-time/makefile | 2 +- qt/sqlite/template/makefile | 2 +- 12 files changed, 17 insertions(+), 15 deletions(-) (limited to 'qt') diff --git a/qt/common/containers/makefile b/qt/common/containers/makefile index 85aec25..f675c37 100644 --- a/qt/common/containers/makefile +++ b/qt/common/containers/makefile @@ -45,7 +45,8 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) \ ---profile qt/containers --profile qt/basic --generate-schema +--profile qt/containers --profile qt/basic --generate-schema \ +--table-prefix qt_common_containers_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) diff --git a/qt/common/smart-ptr/makefile b/qt/common/smart-ptr/makefile index a7742f2..21ba8b8 100644 --- a/qt/common/smart-ptr/makefile +++ b/qt/common/smart-ptr/makefile @@ -45,7 +45,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) \ ---profile qt/smart-ptr --generate-schema +--profile qt/smart-ptr --generate-schema --table-prefix qt_common_smart_ptr_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) diff --git a/qt/common/template/makefile b/qt/common/template/makefile index e3f52f0..d0cb3d8 100644 --- a/qt/common/template/makefile +++ b/qt/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 qt/version --generate-schema # CHANGE qt/version +--profile qt/version --generate-schema \ +--table-prefix qt_common_template_ #@@ CHANGE table prefix, qt/version $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) diff --git a/qt/mysql/basic/makefile b/qt/mysql/basic/makefile index 6d48f0c..dcfac13 100644 --- a/qt/mysql/basic/makefile +++ b/qt/mysql/basic/makefile @@ -1,4 +1,4 @@ -# file : qt/mysql/date-time/makefile +# file : qt/mysql/basic/makefile # author : Constantin Michael # copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file @@ -45,7 +45,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database mysql --profile qt/basic \ ---generate-schema +--generate-schema --table-prefix qt_mysql_basic_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) diff --git a/qt/mysql/date-time/makefile b/qt/mysql/date-time/makefile index ca8e79c..ef50f46 100644 --- a/qt/mysql/date-time/makefile +++ b/qt/mysql/date-time/makefile @@ -45,7 +45,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database mysql --profile qt/date-time \ ---generate-schema +--generate-schema --table-prefix qt_mysql_date_time_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) diff --git a/qt/mysql/template/makefile b/qt/mysql/template/makefile index a76f0cc..aa5381d 100644 --- a/qt/mysql/template/makefile +++ b/qt/mysql/template/makefile @@ -40,7 +40,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database mysql --profile qt \ ---generate-schema +--generate-schema --table-prefix qt_mysql_template_ #@@ CHANGE THIS $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) diff --git a/qt/pgsql/basic/makefile b/qt/pgsql/basic/makefile index ef1057f..977cdca 100644 --- a/qt/pgsql/basic/makefile +++ b/qt/pgsql/basic/makefile @@ -1,4 +1,4 @@ -# file : qt/pgsql/date-time/makefile +# file : qt/pgsql/basic/makefile # author : Constantin Michael # copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file @@ -45,7 +45,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database pgsql --profile qt/basic \ ---generate-schema +--generate-schema --table-prefix qt_pgsql_basic_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) diff --git a/qt/pgsql/date-time/makefile b/qt/pgsql/date-time/makefile index 9d63918..51f8375 100644 --- a/qt/pgsql/date-time/makefile +++ b/qt/pgsql/date-time/makefile @@ -45,7 +45,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database pgsql --profile qt/date-time \ ---generate-schema +--generate-schema --table-prefix qt_pgsql_date_time_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) diff --git a/qt/pgsql/template/makefile b/qt/pgsql/template/makefile index 9905b4c..c599c3e 100644 --- a/qt/pgsql/template/makefile +++ b/qt/pgsql/template/makefile @@ -40,7 +40,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database pgsql --profile qt \ ---generate-schema +--generate-schema --table-prefix qt_pgsql_template_ #@@ CHANGE THIS $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) diff --git a/qt/sqlite/basic/makefile b/qt/sqlite/basic/makefile index e1b1af0..aeede6a 100644 --- a/qt/sqlite/basic/makefile +++ b/qt/sqlite/basic/makefile @@ -1,4 +1,4 @@ -# file : qt/sqlite/date-time/makefile +# file : qt/sqlite/basic/makefile # author : Constantin Michael # copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file @@ -45,7 +45,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database sqlite --profile qt/basic \ ---generate-schema +--generate-schema --table-prefix qt_sqlite_basic_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) diff --git a/qt/sqlite/date-time/makefile b/qt/sqlite/date-time/makefile index 261200a..a105859 100644 --- a/qt/sqlite/date-time/makefile +++ b/qt/sqlite/date-time/makefile @@ -45,7 +45,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database sqlite --profile qt/date-time \ ---generate-schema +--generate-schema --table-prefix qt_sqlite_date_time_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) diff --git a/qt/sqlite/template/makefile b/qt/sqlite/template/makefile index b19b8ef..b86ba6e 100644 --- a/qt/sqlite/template/makefile +++ b/qt/sqlite/template/makefile @@ -40,7 +40,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database sqlite --profile qt \ ---generate-schema +--generate-schema --table-prefix qt_sqlite_template_ #@@ CHANGE THIS $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) -- cgit v1.1