diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-10-29 10:04:47 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-10-29 10:04:47 +0200 |
| commit | c9b3d19c3e1771cb1f0a3d93552e48e5f1d47025 (patch) | |
| tree | 714be71aec621f4a4bfa2b00d27839332bd1f9a1 /pgsql | |
| parent | e43ec751d10b8346e1450781d64595b6fb7e1185 (diff) | |
Don't make database default in database-specific tests
Diffstat (limited to 'pgsql')
| -rw-r--r-- | pgsql/custom/makefile | 7 | ||||
| -rw-r--r-- | pgsql/index/makefile | 4 | ||||
| -rw-r--r-- | pgsql/template/makefile | 4 | ||||
| -rw-r--r-- | pgsql/truncation/makefile | 4 | ||||
| -rw-r--r-- | pgsql/types/makefile | 6 |
5 files changed, 13 insertions, 12 deletions
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) |