From c9b3d19c3e1771cb1f0a3d93552e48e5f1d47025 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 29 Oct 2012 10:04:47 +0200
Subject: Don't make database default in database-specific tests

---
 mysql/custom/makefile     | 7 ++++---
 mysql/index/makefile      | 4 ++--
 mysql/template/makefile   | 4 ++--
 mysql/truncation/makefile | 4 ++--
 mysql/types/makefile      | 6 +++---
 5 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'mysql')

diff --git a/mysql/custom/makefile b/mysql/custom/makefile
index e5e3983..7700323 100644
--- a/mysql/custom/makefile
+++ b/mysql/custom/makefile
@@ -34,9 +34,10 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database mysql --generate-schema \
---generate-query --hxx-prologue '\#include "traits.hxx"' \
---hxx-prologue '\#include "query.hxx"' --table-prefix mysql_custom_
+$(gen) $(dist): export odb_options += --database mysql --default-database \
+common --generate-schema --generate-query --hxx-prologue \
+'\#include "traits.hxx"' --hxx-prologue '\#include "query.hxx"' \
+--table-prefix mysql_custom_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/mysql/index/makefile b/mysql/index/makefile
index 3218c00..c594679 100644
--- a/mysql/index/makefile
+++ b/mysql/index/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database mysql --generate-schema \
---table-prefix mysql_index_
+$(gen) $(dist): export odb_options += --database mysql --default-database \
+common --generate-schema --table-prefix mysql_index_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/mysql/template/makefile b/mysql/template/makefile
index 3371da0..6bb505f 100644
--- a/mysql/template/makefile
+++ b/mysql/template/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database mysql --generate-schema \
---table-prefix mysql_template_ #@@ CHANGE THIS
+$(gen) $(dist): export odb_options += --database mysql --default-database \
+common --generate-schema --table-prefix mysql_template_ #@@ CHANGE THIS
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/mysql/truncation/makefile b/mysql/truncation/makefile
index caa9ebb..95f951b 100644
--- a/mysql/truncation/makefile
+++ b/mysql/truncation/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database mysql --generate-query \
---generate-schema --table-prefix mysql_truncation_
+$(gen) $(dist): export odb_options += --database mysql --default-database \
+common --generate-schema --generate-query --table-prefix mysql_truncation_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/mysql/types/makefile b/mysql/types/makefile
index 112af70..0770d8b 100644
--- a/mysql/types/makefile
+++ b/mysql/types/makefile
@@ -34,9 +34,9 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database mysql --generate-schema \
---generate-query --hxx-prologue '\#include "traits.hxx"' \
---table-prefix mysql_types_
+$(gen) $(dist): export odb_options += --database mysql --default-database \
+common --generate-schema --generate-query --hxx-prologue \
+'\#include "traits.hxx"' --table-prefix mysql_types_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
-- 
cgit v1.1