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 +++---
 mysql/custom/makefile      | 7 ++++---
 mysql/index/makefile       | 4 ++--
 mysql/template/makefile    | 4 ++--
 mysql/truncation/makefile  | 4 ++--
 mysql/types/makefile       | 6 +++---
 oracle/custom/makefile     | 7 ++++---
 oracle/template/makefile   | 4 ++--
 oracle/types/makefile      | 6 +++---
 pgsql/custom/makefile      | 7 ++++---
 pgsql/index/makefile       | 4 ++--
 pgsql/template/makefile    | 4 ++--
 pgsql/truncation/makefile  | 4 ++--
 pgsql/types/makefile       | 6 +++---
 sqlite/custom/makefile     | 4 ++--
 sqlite/template/makefile   | 4 ++--
 sqlite/truncation/makefile | 4 ++--
 sqlite/types/makefile      | 6 +++---
 21 files changed, 56 insertions(+), 51 deletions(-)

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)
 
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)
 
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)
 
diff --git a/pgsql/custom/makefile b/pgsql/custom/makefile
index 9c4cf91..4cdc1a2 100644
--- a/pgsql/custom/makefile
+++ b/pgsql/custom/makefile
@@ -34,9 +34,10 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database pgsql --generate-schema \
---generate-query --hxx-prologue '\#include "traits.hxx"' \
---hxx-prologue '\#include "query.hxx"' --table-prefix pgsql_custom_
+$(gen) $(dist): export odb_options += --database pgsql --default-database \
+common --generate-schema --generate-query --hxx-prologue \
+'\#include "traits.hxx"' --hxx-prologue '\#include "query.hxx"' \
+--table-prefix pgsql_custom_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/pgsql/index/makefile b/pgsql/index/makefile
index e6f8ca6..cb898f2 100644
--- a/pgsql/index/makefile
+++ b/pgsql/index/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database pgsql --generate-schema \
---table-prefix pgsql_index_
+$(gen) $(dist): export odb_options += --database pgsql --default-database \
+common --generate-schema --table-prefix pgsql_index_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/pgsql/template/makefile b/pgsql/template/makefile
index b966ac8..f62cd55 100644
--- a/pgsql/template/makefile
+++ b/pgsql/template/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database pgsql --generate-schema \
---table-prefix pgsql_template_ #@@ CHANGE THIS
+$(gen) $(dist): export odb_options += --database pgsql --default-database \
+common --generate-schema --table-prefix pgsql_template_ #@@ CHANGE THIS
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/pgsql/truncation/makefile b/pgsql/truncation/makefile
index f61eef4..63300c2 100644
--- a/pgsql/truncation/makefile
+++ b/pgsql/truncation/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database pgsql --generate-query \
---generate-schema --table-prefix pgsql_truncation_
+$(gen) $(dist): export odb_options += --database pgsql --default-database \
+common --generate-schema  --generate-query --table-prefix pgsql_truncation_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/pgsql/types/makefile b/pgsql/types/makefile
index ccaedbf..2a8cd93 100644
--- a/pgsql/types/makefile
+++ b/pgsql/types/makefile
@@ -34,9 +34,9 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database pgsql --generate-schema \
---generate-query --cxx-prologue '\#include "traits.hxx"' \
---table-prefix pgsql_types_
+$(gen) $(dist): export odb_options += --database pgsql --default-database \
+common --generate-schema --generate-query --cxx-prologue \
+'\#include "traits.hxx"' --table-prefix pgsql_types_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/sqlite/custom/makefile b/sqlite/custom/makefile
index de52742..d61dc95 100644
--- a/sqlite/custom/makefile
+++ b/sqlite/custom/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database sqlite --generate-schema \
---generate-query --table-prefix sqlitex_custom_
+$(gen) $(dist): export odb_options += --database sqlite --default-database \
+common --generate-schema --generate-query --table-prefix sqlitex_custom_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/sqlite/template/makefile b/sqlite/template/makefile
index 65bc159..4341cc8 100644
--- a/sqlite/template/makefile
+++ b/sqlite/template/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database sqlite --generate-schema \
---table-prefix sqlitex_template_ #@@ CHANGE THIS
+$(gen) $(dist): export odb_options += --database sqlite --default-database \
+common --generate-schema --table-prefix sqlitex_template_ #@@ CHANGE THIS
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/sqlite/truncation/makefile b/sqlite/truncation/makefile
index 3dfae0e..9fedbd1 100644
--- a/sqlite/truncation/makefile
+++ b/sqlite/truncation/makefile
@@ -34,8 +34,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database sqlite --generate-query \
---generate-schema --table-prefix sqlitex_truncation_
+$(gen) $(dist): export odb_options += --database sqlite --default-database \
+common --generate-schema --generate-query --table-prefix sqlitex_truncation_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/sqlite/types/makefile b/sqlite/types/makefile
index 4e78f0a..0dbdee4 100644
--- a/sqlite/types/makefile
+++ b/sqlite/types/makefile
@@ -34,9 +34,9 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database sqlite --generate-schema \
---generate-query --cxx-prologue '\#include "traits.hxx"' \
---table-prefix sqlitex_types_
+$(gen) $(dist): export odb_options += --database sqlite --default-database \
+common --generate-schema --generate-query --cxx-prologue \
+'\#include "traits.hxx"' --table-prefix sqlitex_types_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
-- 
cgit v1.1