Add support for mapping char[N] to CHAR/VARCHAR database types

Also improve query support for arrays (decaying).

2 files changed, 67 insertions, 8 deletions

diff --git a/mysql/types/driver.cxx b/mysql/types/driver.cxx
index d2f159c..0a7155e 100644
--- a/mysql/types/driver.cxx
+++ b/mysql/types/driver.cxx
@@ -101,6 +101,34 @@ main (int argc, char* argv[])
 
       assert (o == *o1);
     }
+
+    // Test char array.
+    //
+    {
+      char_array o1 (1, "");
+      char_array o2 (2, "1234567890");
+      char_array o3 (3, "1234567890123456");
+
+      {
+        transaction t (db->begin ());
+        db->persist (o1);
+        db->persist (o2);
+        db->persist (o3);
+        t.commit ();
+      }
+
+      {
+        transaction t (db->begin ());
+        auto_ptr<char_array> p1 (db->load<char_array> (1));
+        auto_ptr<char_array> p2 (db->load<char_array> (2));
+        auto_ptr<char_array> p3 (db->load<char_array> (3));
+        t.commit ();
+
+        assert (o1 == *p1);
+        assert (o2 == *p2);
+        assert (o3 == *p3);
+      }
+    }
   }
   catch (const odb::exception& e)
   {
diff --git a/mysql/types/test.hxx b/mysql/types/test.hxx
index bf1ac9f..bc4c773 100644
--- a/mysql/types/test.hxx
+++ b/mysql/types/test.hxx
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 #include <memory>  // std::auto_ptr
+#include <cstring> // std::strncpy, std::str[n]cmp
 
 #include <odb/core.hxx>
 
@@ -87,14 +88,8 @@ enum color {red, green, blue};
 #pragma db object
 struct object
 {
-  object (unsigned long id)
-      : id_ (id)
-  {
-  }
-
-  object ()
-  {
-  }
+  object () {}
+  object (unsigned long id): id_ (id) {}
 
   #pragma db id
   unsigned long id_;
@@ -274,4 +269,40 @@ struct object
   }
 };
 
+// Test char array.
+//
+#pragma db object
+struct char_array
+{
+  char_array () {}
+  char_array (unsigned long id, const char* s)
+      : id_ (id)
+  {
+    std::strncpy (s1, s, sizeof (s1));
+    std::strncpy (s2, s, sizeof (s2));
+    s3[0] = c1 = *s;
+  }
+
+  #pragma db id
+  unsigned long id_;
+
+  char s1[17];
+
+  #pragma db type("CHAR(16)")
+  char s2[16];
+
+  char s3[1];
+  char c1;
+
+  bool
+  operator== (const char_array& y) const
+  {
+    return id_ == y.id_ &&
+      std::strcmp (s1, y.s1) == 0 &&
+      std::strncmp (s2, y.s2, sizeof (s2)) == 0 &&
+      s3[0] == y.s3[0] &&
+      c1 == y.c1;
+  }
+};
+
 #endif // TEST_HXX