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

---
 oracle/custom/makefile   | 7 ++++---
 oracle/template/makefile | 4 ++--
 oracle/types/makefile    | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'oracle')

diff --git a/oracle/custom/makefile b/oracle/custom/makefile
index b27c3bd..b3d5e15 100644
--- a/oracle/custom/makefile
+++ b/oracle/custom/makefile
@@ -34,9 +34,10 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database oracle --generate-schema \
---generate-query --hxx-prologue '\#include "traits.hxx"' --sql-interlude \
-"@ $(src_base)/custom.sql" --table-prefix oracle_custom_
+$(gen) $(dist): export odb_options += --database oracle --default-database \
+common --generate-schema --generate-query --hxx-prologue \
+'\#include "traits.hxx"' --sql-interlude "@ $(src_base)/custom.sql" \
+--table-prefix oracle_custom_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/oracle/template/makefile b/oracle/template/makefile
index e68a09c..c931305 100644
--- a/oracle/template/makefile
+++ b/oracle/template/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database oracle --generate-schema \
---table-prefix oracle_template_ #@@ CHANGE THIS
+$(gen) $(dist): export odb_options += --database oracle --default-database \
+common --generate-schema --table-prefix oracle_template_ #@@ CHANGE THIS
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/oracle/types/makefile b/oracle/types/makefile
index 08eb42f..df6fefa 100644
--- a/oracle/types/makefile
+++ b/oracle/types/makefile
@@ -34,9 +34,9 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database oracle --generate-schema \
---generate-query --hxx-prologue '\#include "traits.hxx"' \
---table-prefix oracle_types_
+$(gen) $(dist): export odb_options += --database oracle --default-database \
+common --generate-schema --generate-query --hxx-prologue \
+'\#include "traits.hxx"' --table-prefix oracle_types_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
-- 
cgit v1.1