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

---
 mssql/custom/makefile   | 7 ++++---
 mssql/query/makefile    | 5 +++--
 mssql/template/makefile | 4 ++--
 mssql/types/makefile    | 6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'mssql')

diff --git a/mssql/custom/makefile b/mssql/custom/makefile
index 84191f3..9945c44 100644
--- a/mssql/custom/makefile
+++ b/mssql/custom/makefile
@@ -34,9 +34,10 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database mssql --generate-schema \
---generate-query --hxx-prologue '\#include "traits.hxx"' \
---hxx-prologue '\#include "query.hxx"' --table-prefix mssql_custom_
+$(gen) $(dist): export odb_options += --database mssql --default-database \
+common --generate-schema --generate-query --hxx-prologue \
+'\#include "traits.hxx"' --hxx-prologue '\#include "query.hxx"' \
+--table-prefix mssql_custom_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/mssql/query/makefile b/mssql/query/makefile
index 53526b9..cd3a457 100644
--- a/mssql/query/makefile
+++ b/mssql/query/makefile
@@ -34,8 +34,9 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database mssql --generate-schema \
---generate-query --mssql-server-version 9.0 --table-prefix mssql_query_
+$(gen) $(dist): export odb_options += --database mssql --default-database \
+common --generate-schema --generate-query --mssql-server-version 9.0 \
+--table-prefix mssql_query_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/mssql/template/makefile b/mssql/template/makefile
index b451bd4..441e45d 100644
--- a/mssql/template/makefile
+++ b/mssql/template/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database mssql --generate-schema \
---table-prefix mssql_template_ #@@ CHANGE THIS
+$(gen) $(dist): export odb_options += --database mssql --default-database \
+common --generate-schema --table-prefix mssql_template_ #@@ CHANGE THIS
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/mssql/types/makefile b/mssql/types/makefile
index 38935ed..fcac4f3 100644
--- a/mssql/types/makefile
+++ b/mssql/types/makefile
@@ -34,9 +34,9 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database mssql --generate-schema \
---generate-query --hxx-prologue '\#include "traits.hxx"' \
---table-prefix mssql_types_
+$(gen) $(dist): export odb_options += --database mssql --default-database \
+common --generate-schema --generate-query --hxx-prologue \
+'\#include "traits.hxx"' --table-prefix mssql_types_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
-- 
cgit v1.1