Several changes:

    - Fix internal path URL to base dir (in some cases)
    - Added more clarifications related to issue #3682
    - Implemented issue #2692: use placeholder attribute
    - Implemented issue #4922: allow foreign keys to be specified as-is
    - Fix #4791: allow WDialog::setMaximumSize() with % values.
    - Fix #4767: error with WTableView + popup handling

Author: Koen Deforche

ReleaseNotes.html

@@ -22,6 +22,125 @@ <h1>Wt Release notes</h1>
 the way you build Wt, the way you configure Wt or the Wt API and
 behaviour.
 
+<h2>Release 3.3.6 (?, 2016)</h2>
+<p>
+ This release has a focus on bug fixes and some new features:
+</p>
+<dl>
+  <dt>
+    Support for WebSocket compression in wthttp
+  </dt>
+  <dd>
+    WebSocket traffic is now compressed, if possible.
+  </dd>
+  <dt>
+    Time entry improvements
+  </dt>
+  <dd>
+    <a href="classWt_1_1WTimeEdit.html">WTimeEdit</a> now supports AM/PM in its format,
+    <a href="classWt_1_1WTimeValidator.html">WTimeValidator</a> now allows to select a minimum
+    and maximum time and supports multiple formats,
+    <a href="classWt_1_1WTimePicker.html">WTimePicker</a> can now work up to
+    millisecond precision, and is now rendered with spinboxes.
+  </dd>
+  <dt>
+    Skia version updated
+  </dt>
+  <dd>
+    The Skia backend for <a href="classWt_1_1WRasterImage.html">WRasterImage</a> is now compatible with more recent versions of Skia. If you need
+    to support an older version of Skia, use <tt>-DWT_SKIA_OLD=ON</tt>. The Skia version of the Windows builds
+    has been updated from 394c7bb to 834d9e1.
+  </dd>
+  <dt>
+    Wt::Dbo
+  </dt>
+  <dd>
+    It's now possible to mark foreign keys as literal with a &ldquo;&gt;&rdquo; prefix, so Wt::Dbo can better map to
+    an existing schema. Note that for consistency, this also means that the schema generated for ManyToMany relationships
+    has been changed to include the id column names if a joinId has been specified. If you specify a joinId for ManyToMany
+    relationships, you'll have to change it to include a &ldquo;&gt;&rdquo; before it in order to keep the same database schema.
+  </dd>
+  <dt>
+    Scroll position
+  </dt>
+  <dd>
+    It's now possible to retrieve the scroll position of a
+    <a href="classWt_1_1WContainerWidget.html">WContainerWidget</a>
+    with
+    <a href="classWt_1_1WContainerWidget.html#a0a7ce553b2b5107412a3bed8700355cb">scrollTop()</a>
+    and
+    <a href="classWt_1_1WContainerWidget.html#a9a60d382fcd1490081087ce4f3649864">scrollLeft()</a>.
+  </dd>
+  <dt>
+    Invalidation of stateless slots
+  </dt>
+  <dd>
+    <a href="classWt_1_1WObject.html#a6dde4ce1e833a9966709daf3c0dedc9f">WObject::isNotStateless()</a>
+    has been added, so functions called from functions that are marked as stateless can unmark
+    it as stateless, reverting to plain server-side dynamic UI updates.
+  </dd>
+  <dt>
+    <a href="classWt_1_1Auth_1_1Dbo_1_1UserDatabase.html">Auth::Dbo::UserDatabase</a>
+  </dt>
+  <dd>
+    The <a href="classWt_1_1Auth_1_1Dbo_1_1UserDatabase.html">Dbo UserDatabase</a> implementation now
+    compares e-mail addresses case insensitively. The <a href="classWt_1_1Auth_1_1AuthService.html">AuthService</a>
+    can be passed in the constructor, so the <a href="classWt_1_1Auth_1_1Dbo_1_1UserDatabase.html">UserDatabase</a>
+    knows whether the IdentityPolicy is EmailAddressIdentity.
+  </dd>
+  <dt>
+    Charting library
+  </dt>
+  <dd>
+    There have been many bug fixes and improvements to the charting library and the interactive features
+    introduced in Wt 3.3.5:
+    <ul>
+      <li>Series <a href="classWt_1_1Chart_1_1WCartesianChart.html#ad05997dbc2d59862e38272985abda9a9">can be selected</a>
+      on a <a href="classWt_1_1Chart_1_1WCartesianChart.html">WCartesianChart</a>.
+      LineSeries <a href="classWt_1_1Chart_1_1WCartesianChart.html#a6078b67f146e686bd482d846dfe463cb">can be manipulated</a>.</li>
+      <li><a href="classWt_1_1Chart_1_1WAxis.html#a16d188d56c2b62b7b3f2ddb6fa96d7cc">WAxis::setZoom()</a> and
+	  <a href="classWt_1_1Chart_1_1WAxis.html#a2f6a11d9d47036f8806c5a8412dfd24c">WAxis::setPan()</a>
+	  have been deprecated in favor of the easier to use
+	  <a href="classWt_1_1Chart_1_1WAxis.html#a0be187399e7cb4877f2c5e3837eba6ea">WAxis::setZoomRange()</a>.
+	  You can listen to changes in zoom range with the
+	  <a href="classWt_1_1Chart_1_1WAxis.html#a7e432917f0f23f18db3a043397a81904">WAxis::zoomRangeChanged()</a> signal.</li>
+       <li>Series set as hidden will still be shown on a <a href="classWt_1_1Chart_1_1WAxisSliderWidget.html">WAxisSliderWidget</a>.
+	   The typical application for this is to show a coarse model on the slider widget, and a more detailed one on the chart.</li>
+      <li>
+	  In order to provide better performance for charts containing a lot of data, the charting library has been
+	  overhauled to use <a href="classWt_1_1Chart_1_1WAbstractChartModel.html">WAbstractChartModel</a>s,
+	  instead of <a href="classWt_1_1WAbstractItemModel.html">WAbstractItemModel</a>s, avoiding the use of
+	  boost::any. The <a href="classWt_1_1Chart_1_1WStandardChartProxyModel.html">WStandardChartProxyModel</a>
+	  wraps a <a href="classWt_1_1WAbstractItemModel.html">WAbstractItemModel</a> so that those can still be used with charts.
+	  Note that this changes the return type of the
+	  <a href="classWt_1_1Chart_1_1WAbstractChart.html#a477522bb1720fb20006c81be455b3366">WAbstractChart::model()</a> method.
+      </li>
+      <li>A chart's axes can now be <a href="classWt_1_1Chart_1_1WAxis.html#a2bb7c8ec67ed2ff0b57953ea40cd87ef">inverted</a>.
+      <li>Stacked series: negative values are now stacked separately from positive values.</li>
+      <li><a href="classWt_1_1Chart_1_1CurveLabel.html">Curve labels</a> can now be drawn on charts, so that curves,
+          or certain points on curves, can be labeled.</li>
+	  <li><a href="classWt_1_1Chart_1_1WAxis.html#afca24479982f10759be69703de5f4cd4">WAxis::getLabelTicks()</a>
+	  has been modified with an argument
+          <a href="structWt_1_1Chart_1_1AxisConfig.html">AxisConfig</a>, so that different axis ticks can be drawn depending
+	  on the side that the axis is dawn on, or the zoom level it is drawn at. This is a breaking change if you override getLabelTicks.
+	  <a href="classWt_1_1Chart_1_1WAxis.html#a71928aabf753854274d753e266aabfc2">WAxis::setLabelTransform()</a>
+	  as a simpler method to change the tick
+	  labels depending on the side the axis is drawn on.</li>
+      <li><a href="classWt_1_1Chart_1_1WDataSeries.html">WDataSeries</a> is no longer a simple value class. The interface of
+          <a href="classWt_1_1Chart_1_1WCartesianChart.html">WCartesianChart</a> has been modified to reflect that: the old
+	  interface that copies WDataSeries over has been deprecated in favor of an interface that takes pointers to
+	  <a href="classWt_1_1Chart_1_1WDataSeries.html">WDataSeries</a>.</li>
+      <li>It's now possible to <a href="classWt_1_1Chart_1_1WDataSeries.html#ae668a1a90ccf668e426fc2d9e370bf2c">specify a different model</a>
+      for each <a href="classWt_1_1Chart_1_1WDataSeries.html">WDataSeries</a>.</li>
+      <li><a href="classWt_1_1Chart_1_1WPieChart.html#a0ff69f626136fa56e7de27f6a10d770d">Chart::WPieChart::createLabelWidget()</a>
+      has been added, making it possible to replace the labels of a
+      <a href="classWt_1_1Chart_1_1WPieChart.html">WPieChart</a>
+      with widgets.</li>
+      <li>Tooltips on charts can now be deferred, which can improve performance of interactive charts, and if you have a lot of tooltips.</li>
+    </ul>
+  </dd>
+</dl>
+
 <h2>Release 3.3.5 (Dec 31, 2015)</h2>
 <p>
  This release has a focus on bug fixes but also one or two new features:

src/Wt/Auth/Dbo/UserDatabase

@@ -226,7 +226,7 @@ public:
   virtual bool setEmail(const User& user, const std::string& address) {
     WithUser find(*this, user);
 
-    if (session_.find<DboType>().where("\"email\" = ?")
+    if (session_.find<DboType>().where("lower(\"email\") = lower(?)")
 	.bind(address).resultList().size() != 0)
       return false;
 

src/Wt/Chart/WPieChart

@@ -263,12 +263,12 @@ public:
   /**
    * @brief createLabelWidget possition textWidget where the text would be
    * rendered.
-   * Assuming that textWidget is added to a container with same dimentions as
+   * Assuming that textWidget is added to a container with same dimensions as
    * the WPieChart.
    * This should be used in combinaltion with drawLabel().
    *
    * @return The new WContainerWidget that contains textWidget and can be placed
-   * on an other layer that has the same dimentions as the WPieChart.
+   * on an other layer that has the same dimensions as the WPieChart.
    * \sa drawLabel()
    *
    * Usage example, PieChart with label links.

src/Wt/Dbo/DbAction_impl.h

@@ -139,6 +139,8 @@ void InitSchema::actCollection(const CollectionRef<C>& field)
   mapping_.sets.push_back
     (Impl::SetInfo(joinTableName, field.type(), joinName, field.joinId(),
 		      field.fkConstraints()));
+  if (field.literalJoinId())
+    mapping_.sets.back().flags |= Impl::SetInfo::LiteralSelfId;
 }
 
     /*

src/Wt/Dbo/Field

@@ -181,12 +181,14 @@ public:
   collection< ptr<C> >& value() const { return value_; }
   const std::string& joinName() const { return joinName_; }
   const std::string& joinId() const { return joinId_; }
+  bool literalJoinId() const { return literalJoinId_; }
   RelationType type() const { return type_; }
   int fkConstraints() const { return fkConstraints_; }
 
 private:
   collection< ptr<C> >& value_;
   std::string joinName_, joinId_;
+  bool literalJoinId_;
   RelationType type_;
   int fkConstraints_;
 };
@@ -198,6 +200,7 @@ public:
   PtrRef(ptr<C>& value, const std::string& name, int size, int fkConstraints);
 
   const std::string& name() const { return name_; }
+  bool literalForeignKey() const { return literalForeignKey_; }
   int fkConstraints() const { return fkConstraints_; }
   ptr<C>& value() const { return value_; }
   typename dbo_traits<C>::IdType id() const { return value_.id(); }
@@ -213,6 +216,7 @@ public:
 private:
   ptr<C>& value_;
   std::string name_;
+  bool literalForeignKey_;
   int size_;
   int fkConstraints_;
 };
@@ -321,6 +325,12 @@ void field(Action& action, ptr<C>& value, const std::string& name,
  * This function binds the pointer field \p value to the database
  * foreign key field(s) \p name <tt>+ "_" +</tt> (C's primary key(s)).
  *
+ * If the name starts with a <tt>&gt;</tt>, the <tt>&gt;</tt> is omitted and
+ * the name is used literally, instead of \p name <tt>+ "_" +</tt> (C's primary key(s)),
+ * e.g. if the primary key of C is <tt>id</tt>, then the name <tt>foo</tt> translates to a
+ * column with the name <tt>foo_id</tt>, and the name <tt>&gt;foo</tt> translates to
+ * a column with the name <tt>foo</tt>.
+ *
  * If the name is omitted or empty, then C's mapped table name is used.
  *
  * A belongsTo() will usually have a counter-part hasMany() or
@@ -371,11 +381,13 @@ void belongsTo(Action& action, ptr<C>& value,
  * from how a hasMany() call backs a collection by a SQL query).
  *
  * The query is defined by the database field(s) \p name <tt>+ "_" +
- * </tt> (C's primary key(s))</tt>, in the mapped table for C. This
+ * </tt> (C's primary key(s)), in the mapped table for C. This
  * should be the same <i>name</i> as passed to the matching
  * belongsTo() method for the other side of the relation. If the \p
  * name is omitted or empty, then the mapped table name of the current
- * class is used.
+ * class is used. If the name starts with <tt>&gt;</tt>, the <tt>&gt;</tt>
+ * is discarded, and the name is used literally, instead of \p name <tt>+ "_" +
+ * </tt> (C's primary key(s)).
  *
  * A hasOne() must have a counter-part belongsTo() declaration in the
  * referenced class \p C.
@@ -433,8 +445,13 @@ void hasMany(Action& action, collection< ptr<C> >& value,
  * Wt::Dbo::ManyToMany ManyToMany\endlink.
  *
  * The \p joinId is used to reference this side of the relationship in
- * the join table. If \p joinId is left blank, the value will be table
- * name <tt>+ "_" +</tt> (primary key(s)) of the current class.
+ * the join table, e.g. if \p joinId is <tt>foo</tt> and the primary key
+ * is <tt>id</tt>, then this side of the join table will be named <tt>foo_id</tt>.
+ * If \p joinId is left blank, the value will be table
+ * name <tt>+ "_" +</tt> (primary key(s)) of the current class. If \p joinId
+ * starts with <tt>&gt;</tt>, the <tt>&gt;</tt> is omitted, and the joinId
+ * is used literally (the primary key of the current class is not appended),
+ * e.g. <tt>&gt;foo</tt> maps to the column name <tt>foo</tt>.
  *
  * A hasMany() must have a counter-part belongsTo() or hasMany()
  * declaration in the referenced class \p C.

src/Wt/Dbo/Field_impl.h

@@ -66,18 +66,33 @@ CollectionRef<C>::CollectionRef(collection< ptr<C> >& value,
 				const std::string& joinName,
 				const std::string& joinId,
 				int fkConstraints)
-  : value_(value), joinName_(joinName), joinId_(joinId), type_(type),
-    fkConstraints_(fkConstraints)
-{ }
+  : value_(value), joinName_(joinName), joinId_(joinId),
+    literalJoinId_(false),
+    type_(type), fkConstraints_(fkConstraints)
+{
+  if (type == ManyToOne && !joinName.empty() && joinName[0] == '>') {
+    joinName_ = std::string(joinName.c_str() + 1, joinName.size() - 1);
+  }
+  if (type == ManyToMany && !joinId.empty() && joinId[0] == '>') {
+    joinId_ = std::string(joinId.c_str() + 1, joinId.size() - 1);
+    literalJoinId_ = true;
+  }
+}
 
 template <class C>
 PtrRef<C>::PtrRef(ptr<C>& value, const std::string& name, int size,
 		  int fkConstraints)
   : value_(value),
     name_(name),
+    literalForeignKey_(false),
     size_(size),
     fkConstraints_(fkConstraints)
-{ }
+{
+  if (!name.empty() && name[0] == '>') {
+    name_ = std::string(name.c_str() + 1, name.size() - 1);
+    literalForeignKey_ = true;
+  }
+}
 
 template <class C, class A, class Enable = void>
 struct LoadLazyHelper
@@ -124,7 +139,11 @@ void PtrRef<C>::visit(A& action, Session *session) const
       idFieldName = mapping->surrogateIdFieldName;
   }
 
-  field(action, id, name_ + "_" + idFieldName, size);
+  if (literalForeignKey()) {
+    field(action, id, name_, size);
+  } else {
+    field(action, id, name_ + "_" + idFieldName, size);
+  }
 
   LoadLazyHelper<C, A>::loadLazy(value_, id, session);
 }
@@ -133,7 +152,11 @@ template <class C>
 WeakPtrRef<C>::WeakPtrRef(weak_ptr<C>& value, const std::string& joinName)
   : value_(value),
     joinName_(joinName)
-{ }
+{
+  if (!joinName.empty() && joinName[0] == '>') {
+    joinName_ = std::string(joinName.c_str() + 1, joinName.size() - 1);
+  }
+}
 
 template <class C>
 const std::type_info *PtrRef<C>::type() const

src/Wt/Dbo/Session

@@ -29,9 +29,17 @@ namespace Wt {
       template <class C, typename T> struct LoadHelper;
 
       struct WTDBO_API SetInfo {
+	enum SetInfoFlags {
+	  // Normally, if there is no surrogate key, the field name of the natural id
+	  // is appended to joinSelfId/joinOtherId. These flags prevent that.
+	  LiteralSelfId = 0x1, // joinSelfId is literal, don't append primary key name
+	  LiteralOtherId = 0x2 // joinOtherId is literal, don't append primary key name
+	};
+
 	const char *tableName;
 	std::string joinName;
 	std::string joinSelfId, joinOtherId;
+	int flags;
 	RelationType type;
 	int fkConstraints, otherFkConstraints;
 
@@ -559,7 +567,8 @@ private:
                              std::string foreignKeyName);
 
   std::vector<JoinId> getJoinIds(Impl::MappingInfo *mapping, 
-				 const std::string& joinId);
+				 const std::string& joinId,
+				 bool literalJoinId);
 
   void createTable(Impl::MappingInfo *mapping,
 		   std::set<std::string>& tablesCreated,
@@ -580,11 +589,13 @@ private:
 		       const std::string& joinId1,
 		       const std::string& joinId2,
 		       int fkConstraints1, int fkConstraints2,
+		       bool literalJoinId1, bool literalJoinId2,
 		       std::set<std::string>& tablesCreated,
 		       std::ostream *sout);
   void addJoinTableFields(Impl::MappingInfo& joinTableMapping,
 			  Impl::MappingInfo *mapping, const std::string& joinId,
-			  const std::string& foreignKeyName, int fkConstraints);
+			  const std::string& foreignKeyName, int fkConstraints,
+			  bool literalJoinId);
   void createJoinIndex(Impl::MappingInfo& joinTableMapping,
 		       Impl::MappingInfo *mapping,
 		       const std::string& joinId,