diff options
| -rw-r--r-- | pgsql/native/driver.cxx | 51 | ||||
| -rw-r--r-- | pgsql/native/makefile | 7 | ||||
| -rw-r--r-- | pgsql/template/makefile | 22 |
3 files changed, 72 insertions, 8 deletions
diff --git a/pgsql/native/driver.cxx b/pgsql/native/driver.cxx index 79ed08c..30e707c 100644 --- a/pgsql/native/driver.cxx +++ b/pgsql/native/driver.cxx @@ -3,7 +3,7 @@ // copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -// Test native SQL execution. +// Test PostgreSQL native SQL execution. // #include <memory> // std::auto_ptr @@ -12,11 +12,56 @@ #include <odb/pgsql/database.hxx> +#include <common/common.hxx> + using namespace std; +using namespace odb::core; int -main () +main (int argc, char* argv[]) { + try + { + auto_ptr<database> db (create_database (argc, argv, false)); + + // Create the database schema. + // + { + transaction t (db->begin ()); + + db->execute ("DROP TABLE IF EXISTS test"); + db->execute ("CREATE TABLE test (n INT PRIMARY KEY)"); + + t.commit (); + } + + // Insert a few rows. + // + { + transaction t (db->begin ()); + + assert (db->execute ("INSERT INTO test (n) VALUES (1)") == 1); + assert (db->execute ("INSERT INTO test (n) VALUES (2)") == 1); + + t.commit (); + } + + // select a few rows. + // + { + transaction t (db->begin ()); + + assert (db->execute ("SELECT n FROM test WHERE n < 3") == 2); + assert (db->execute ("SELECT n FROM test WHERE n > 3") == 0); + + t.commit (); + } + } + catch (const odb::exception& e) + { + cerr << e.what () << endl; + return 1; + } + return 0; } - diff --git a/pgsql/native/makefile b/pgsql/native/makefile index 2e7900d..95eb060 100644 --- a/pgsql/native/makefile +++ b/pgsql/native/makefile @@ -9,6 +9,9 @@ cxx_tun := driver.cxx cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) cxx_od := $(cxx_obj:.o=.o.d) +common.l := $(out_root)/libcommon/common/common.l +common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options + driver := $(out_base)/driver dist := $(out_base)/.dist test := $(out_base)/.test @@ -22,9 +25,9 @@ $(call import,\ # Build. # -$(driver): $(cxx_obj) $(odb_pgsql.l) +$(driver): $(cxx_obj) $(odb_pgsql.l) $(common.l) $(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) -$(cxx_obj) $(cxx_od): $(odb_pgsql.l.cpp-options) +$(cxx_obj) $(cxx_od): $(odb_pgsql.l.cpp-options) $(common.l.cpp-options) $(call include-dep,$(cxx_od)) diff --git a/pgsql/template/makefile b/pgsql/template/makefile index b422eb7..6dc0aad 100644 --- a/pgsql/template/makefile +++ b/pgsql/template/makefile @@ -6,9 +6,13 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make cxx_tun := driver.cxx +odb_hdr := cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) cxx_od := $(cxx_obj:.o=.o.d) +common.l := $(out_root)/libcommon/common/common.l +common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options + driver := $(out_base)/driver dist := $(out_base)/.dist test := $(out_base)/.test @@ -22,9 +26,18 @@ $(call import,\ # Build. # -$(driver): $(cxx_obj) +$(driver): $(cxx_obj) $(common.l) $(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) -$(cxx_obj) $(cxx_od): +$(cxx_obj) $(cxx_od): $(common.l.cpp-options) + +genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): $(odb) +$(gen): odb := $(odb) +$(gen) $(dist): export odb_options += --database pgsql --generate-schema +$(gen): cpp_options := -I$(src_base) +$(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -49,7 +62,6 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) @@ -86,3 +98,7 @@ $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) $(call include,$(bld_root)/cxx/o-e.make) + +# Dependencies. +# +$(call import,$(src_root)/libcommon/makefile) |