Add common tests for Oracle

Due to the 30 character limit imposed by Oracle on identifiers, some of the
common tests code and/or makefiles had to be modified.

2 files changed, 6 insertions, 2 deletions

diff --git a/common/container/makefile b/common/container/makefile
index fb14cb0..c1b1124 100644
--- a/common/container/makefile
+++ b/common/container/makefile
@@ -36,7 +36,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
---table-prefix common_container_
+--table-prefix cmn_ctnr_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/container/test.hxx b/common/container/test.hxx
index 2e267f6..ec392ec 100644
--- a/common/container/test.hxx
+++ b/common/container/test.hxx
@@ -54,6 +54,7 @@ struct cont_comp1
 {
   // This composite value does not have any columns.
   //
+  #pragma db id_column("obj_id")
   num_vector sv; // Have the name "conflic" with the one in the object.
 };
 
@@ -63,11 +64,14 @@ struct cont_comp2
   cont_comp2 (): num (777), str ("ggg") {}
 
   int num;
+
+  #pragma db id_column("obj_id")
   str_list sl;
+
   std::string str;
 };
 
-#pragma db object
+#pragma db object table("obj")
 struct object
 {
   object (): nv (comp1_.sv), sl (comp2_.sl) {}