aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-11-03 10:11:24 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-11-03 10:11:24 +0200
commit1bbe6fe0d6269851ac69a383189b0809d86ef40f (patch)
tree7f39a72083b5bbf2073dd68664c767ac5d40fd45 /common
parentcee18c8947e5d0ecae1c1daf2c003737da5f4305 (diff)
Add support for mapping char[N] and unsigned char[N] types to BLOB
New test: common/blob.
Diffstat (limited to 'common')
-rw-r--r--common/blob/driver.cxx71
-rw-r--r--common/blob/makefile109
-rw-r--r--common/blob/test.hxx55
-rw-r--r--common/blob/test.std0
-rw-r--r--common/makefile1
5 files changed, 236 insertions, 0 deletions
diff --git a/common/blob/driver.cxx b/common/blob/driver.cxx
new file mode 100644
index 0000000..0c58deb
--- /dev/null
+++ b/common/blob/driver.cxx
@@ -0,0 +1,71 @@
+// file : common/blob/driver.cxx
+// author : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license : GNU GPL v2; see accompanying LICENSE file
+
+// Test BLOB mapping.
+//
+
+#include <memory> // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+
+#include <common/common.hxx>
+
+#include "test.hxx"
+#include "test-odb.hxx"
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+ try
+ {
+ auto_ptr<database> db (create_database (argc, argv));
+
+ const char data[] =
+ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B"
+ "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B"
+ "cccccccccccccccccccccccccccccccccccccccccccccccc"
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B"
+ "dddddddddddddddddddddddddddddddddddddddddddddddd"
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B"
+ "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B"
+ "ffffffffffffffffffffffffffffffffffffffffffffffff";
+
+ const unsigned char* udata = reinterpret_cast<const unsigned char*> (data);
+
+ object o (1);
+ o.vc.assign (data, data + sizeof (data));
+ o.vuc.assign (udata, udata + sizeof (data));
+ memcpy (o.c, data, sizeof (data));
+ memcpy (o.uc, udata, sizeof (data));
+
+ {
+ transaction t (db->begin ());
+ db->persist (o);
+ t.commit ();
+ }
+
+ {
+ transaction t (db->begin ());
+ auto_ptr<object> o1 (db->load<object> (1));
+ t.commit ();
+
+ assert (o == *o1);
+ }
+ }
+ catch (const odb::exception& e)
+ {
+ cerr << e.what () << endl;
+ return 1;
+ }
+}
diff --git a/common/blob/makefile b/common/blob/makefile
new file mode 100644
index 0000000..ae0ea11
--- /dev/null
+++ b/common/blob/makefile
@@ -0,0 +1,109 @@
+# file : common/blob/makefile
+# author : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
+
+cxx_tun := driver.cxx
+odb_hdr := test.hxx
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.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
+clean := $(out_base)/.clean
+
+# Import.
+#
+$(call import,\
+ $(scf_root)/import/odb/stub.make,\
+ odb: odb,odb-rules: odb_rules)
+
+# Build.
+#
+$(driver): $(cxx_obj) $(common.l)
+$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
+$(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 $(db_id) --generate-schema \
+--table-prefix blob_
+$(gen): cpp_options := -I$(src_base)
+$(gen): $(common.l.cpp-options)
+
+$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
+
+$(dist): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): data_dist := test.std
+$(dist): export name := $(name)
+$(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \
+$(call vc10projs,$(name))
+$(dist):
+ $(call dist-data,$(sources) $(headers) $(data_dist))
+ $(call meta-automake,../template/Makefile.am)
+ $(call meta-vc9projs,../template/template,$(name))
+ $(call meta-vc10projs,../template/template,$(name))
+
+# 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)
+ $(call message,,rm -f $(out_base)/test.out)
+
+# Clean.
+#
+$(clean): \
+ $(driver).o.clean \
+ $(addsuffix .cxx.clean,$(cxx_obj)) \
+ $(addsuffix .cxx.clean,$(cxx_od)) \
+ $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+ $(call message,,rm -f $(out_base)/test.out)
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver $(genf)
+$(clean): $(out_base)/.gitignore.clean
+
+$(call include,$(bld_root)/git/gitignore.make)
+endif
+
+# How to.
+#
+$(call include,$(bld_root)/dist.make)
+$(call include,$(bld_root)/meta/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
+$(call include,$(bld_root)/meta/automake.make)
+
+$(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)
diff --git a/common/blob/test.hxx b/common/blob/test.hxx
new file mode 100644
index 0000000..5fb501e
--- /dev/null
+++ b/common/blob/test.hxx
@@ -0,0 +1,55 @@
+// file : common/blob/test.hxx
+// author : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST_HXX
+#define TEST_HXX
+
+#include <vector>
+#include <cstring> // std::memcmp
+
+#include <odb/core.hxx>
+
+#ifdef ODB_COMPILER
+# ifdef ODB_DATABASE_PGSQL
+# define BLOB_TYPE "BYTEA"
+# else
+# define BLOB_TYPE "BLOB"
+# endif
+#endif
+
+#pragma db object
+struct object
+{
+ object () {}
+ object (unsigned long id): id_ (id) {}
+
+ #pragma db id
+ unsigned long id_;
+
+ #pragma db type(BLOB_TYPE)
+ std::vector<char> vc;
+
+ #pragma db type(BLOB_TYPE)
+ std::vector<unsigned char> vuc;
+
+ #pragma db type(BLOB_TYPE)
+ char c[1024];
+
+ #pragma db type(BLOB_TYPE)
+ unsigned char uc[1024];
+};
+
+inline bool
+operator== (const object& x, const object& y)
+{
+ return
+ x.id_ == y.id_ &&
+ x.vc == y.vc &&
+ x.vuc == y.vuc &&
+ std::memcmp (x.c, y.c, sizeof (x.c)) == 0 &&
+ std::memcmp (x.uc, y.uc, sizeof (x.uc)) == 0;
+}
+
+#endif // TEST_HXX
diff --git a/common/blob/test.std b/common/blob/test.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common/blob/test.std
diff --git a/common/makefile b/common/makefile
index c17bedc..37d50d3 100644
--- a/common/makefile
+++ b/common/makefile
@@ -7,6 +7,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
tests := \
auto \
+blob \
callback \
composite \
const-object \