a batch of Wt::Dbo fixes and improvements, and other fixes (for IE9, misc bugs)

Author: Koen Deforche

examples/painting/PaintExample.C

@@ -73,7 +73,7 @@ PaintExample::PaintExample(WContainerWidget *root, bool showTitle)
   shapes_ = new ShapesWidget();
   shapes_->setAngle(0.0);
   shapes_->setRelativeSize(0.5);
-  shapes_->setPreferredMethod(WPaintedWidget::InlineSvgVml);
+  shapes_->setPreferredMethod(WPaintedWidget::HtmlCanvas);
 
   layout->addWidget(shapes_, 1, 1, AlignCenter | AlignMiddle);
 }

examples/wt-homepage/wt-home.xml

@@ -490,7 +490,7 @@ target="_blank">nice introduction to Wt</a> written by Victor Venkman.</p>
   set. For Ajax sessions, they support <b>pre-loading</b> and <b>lazy
   loading</b> of the contents associated with each item. Pre-loaded
   contents does not increase the load time because the Wt rendering
-  engine oalways ptimizes the response time by only transmitting
+  engine always optimizes the response time by only transmitting
   visual widgets or changes first. Everything invisible (such as the
   contents for other pre-loaded menu items) is transmitted in the
   background, after rendering the visible contents.

src/CMakeLists.txt

@@ -287,6 +287,7 @@ web/WebSession.C
 web/WebSocketMessage.C
 web/WebRenderer.C
 web/WebUtils.C
+web/FileUtils.C
 web/TimeUtil.C
 web/XSSFilter.C
 web/XSSUtils.C

src/Wt/Chart/WChart2DRenderer.C

@@ -330,6 +330,8 @@ public:
 					it_.currentYSegment()).x(),
 			  renderer_.chartArea().top());
       break;
+    default:
+      break;
     }
 
     double g = numGroups_ + (numGroups_ - 1) * renderer_.chart()->barMargin();

src/Wt/Dbo/Call.C

@@ -22,8 +22,14 @@ Call::Call(const Call& other)
 
 void Call::run()
 {
-  statement_->execute();
-  statement_->done();
+  try {
+    run_ = true;
+    statement_->execute();
+    statement_->done();
+  } catch (...) {
+    statement_->done();
+    throw;
+  }
 }
 
 Call::Call(Session& session, const std::string& sql)

src/Wt/Dbo/SqlTraits

@@ -39,6 +39,10 @@ class SqlStatement;
  *  - <tt>std::vector<unsigned char></tt> (binary data)
  *  - <tt>boost::optional<T></tt>: to make the type optional
  *    (allowing an SQL <tt>null</tt> value)
+ *  - <tt>boost::posix_time::ptime</tt>: time stamp, an invalid value (e.g.
+ *    default constructed), maps to <tt>null</tt>
+ *  - <tt>boost::posix_time::time_duration</tt>: time interval, an invalid
+ *    value (boost::posix_time::not_a_date_time), maps to <tt>null</tt>
  *
  * In <Wt/Dbo/WtSqlTraits>, traits classes are also provided for:
  *  - WDate

src/Wt/Dbo/StdSqlTraits

@@ -13,6 +13,7 @@
 #include <Wt/Dbo/SqlStatement>
 
 #include <boost/optional.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_enum.hpp>
 
@@ -101,6 +102,30 @@ struct WTDBO_API sql_value_traits<double, void>
   static bool read(double& v, SqlStatement *statement, int column, int size);
 };
 
+template<>
+struct WTDBO_API sql_value_traits<boost::posix_time::ptime, void>
+{
+  static const bool specialized = true;
+
+  static const char *type(SqlConnection *conn, int size);
+  static void bind(const boost::posix_time::ptime& v, SqlStatement *statement,
+		   int column, int size);
+  static bool read(boost::posix_time::ptime& v, SqlStatement *statement,
+		   int column, int size);
+};
+
+template<>
+struct WTDBO_API sql_value_traits<boost::posix_time::time_duration, void>
+{
+  static const bool specialized = true;
+
+  static const char *type(SqlConnection *conn, int size);
+  static void bind(const boost::posix_time::time_duration& v,
+		   SqlStatement *statement, int column, int size);
+  static bool read(boost::posix_time::time_duration& v,
+		   SqlStatement *statement, int column, int size);
+};
+
 template <typename Enum>
 struct WTDBO_API sql_value_traits<Enum,
 			typename boost::enable_if<boost::is_enum<Enum> >::type> 

src/Wt/Dbo/StdSqlTraits.C

@@ -218,9 +218,73 @@ bool sql_value_traits<double>::read(double& v, SqlStatement *statement,
 }
 
   /*
-   * std::vector<unsigned char>
+   * boost::posix_time::ptime
    */
 
+const char *sql_value_traits<boost::posix_time::ptime>
+::type(SqlConnection *conn, int size)
+{
+  return conn->dateTimeType(SqlDateTime);
+}
+
+void sql_value_traits<boost::posix_time::ptime>
+::bind(const boost::posix_time::ptime& v, SqlStatement *statement,
+       int column, int size)
+{
+  if (v.is_special())
+    statement->bindNull(column);
+  else
+    statement->bind(column, v, SqlDateTime);
+}
+
+bool sql_value_traits<boost::posix_time::ptime>
+::read(boost::posix_time::ptime& v, SqlStatement *statement, int column,
+       int size)
+{
+  if (statement->getResult(column, &v, SqlDateTime))
+    return true;
+  else {
+    v = boost::posix_time::ptime();
+    return false;
+  }
+}
+
+  /*
+   * boost::posix_time::time_duration
+   */
+
+const char *sql_value_traits<boost::posix_time::time_duration>
+::type(SqlConnection *conn, int size)
+{
+  return conn->dateTimeType(SqlTime);
+}
+
+void sql_value_traits<boost::posix_time::time_duration>
+::bind(const boost::posix_time::time_duration& v, SqlStatement *statement,
+       int column, int size)
+{
+  if (v.is_special())
+    statement->bindNull(column);
+  else
+    statement->bind(column, v);
+}
+
+bool sql_value_traits<boost::posix_time::time_duration>
+::read(boost::posix_time::time_duration& v, SqlStatement *statement,
+       int column, int size)
+{
+  if (statement->getResult(column, &v))
+    return true;
+  else {
+    v = boost::posix_time::time_duration(boost::posix_time::not_a_date_time);
+    return false;
+  }
+}
+
+   /*
+    * std::vector<unsigned char>
+    */
+
 const char *sql_value_traits<std::vector<unsigned char> >
 ::type(SqlConnection *conn, int size)
 {

src/Wt/Dbo/WtSqlTraits

@@ -53,7 +53,8 @@ struct sql_value_traits<WTime, void>
   static const char *format;
 
   static const char *type(SqlConnection *conn, int size);
-  static void bind(const WTime& v, SqlStatement *statement, int column, int size);
+  static void bind(const WTime& v, SqlStatement *statement, int column,
+		   int size);
   static bool read(WTime& v, SqlStatement *statement, int column, int size);
 };
 

src/Wt/Dbo/ptr_impl.h

@@ -285,7 +285,12 @@ ptr<C>& ptr<C>::operator= (const ptr<C>& other)
 template <class C>
 const C *ptr<C>::operator->() const
 {
-  return get();
+  const C *v = get();
+
+  if (!v)
+    throw Exception("Wt::Dbo::ptr: null dereference");
+
+  return v;
 }
 
 template <class C>
@@ -303,7 +308,7 @@ const C& ptr<C>::operator*() const
   if (obj_)
     return *obj_->obj();
   else
-    throw Exception("ptr: null dereference");
+    throw Exception("Wt::Dbo::ptr: null dereference");
 }
 
 template <class C>
@@ -312,7 +317,7 @@ typename ptr<C>::mutator ptr<C>::modify() const
   if (obj_)
     return mutator(obj_);
   else
-    throw Exception("ptr: null dereference");
+    throw Exception("Wt::Dbo::ptr: null dereference");
 }
 
 template <class C>