Skip to content

Commit 470bc74

Browse files
committed
Several changes:
- Wt 4 specific: - PostgreSQL: fixed date/time (de)serialization - Fixed duration binding/retrieving for Sqlite - Don't use gmtime, just use date library in MSSQLServer - std::unique_ptr<SqlStatement> instead of raw pointer where appropriate - Merges from master: - Finalized release date for 3.3.8 - Wt::Dbo: alias every column retrieved - Fixed SQL Server static linking issues - Fixed issue where image preloading could break incremental updates - Merged Microsoft SQL Server support for Wt::Dbo - Fixing and simplifying count query so it's always correct - SQL Server: using bigint for duration, time is limited to time of day - Dbo: Added test for long and negative durations - Dbo: Use quoted strings in tests for Firebird - MySQL backend: properly store negative durations - MySQL: set utf8mb4 for proper UTF-8 - Removed left over stuff from headers() implementation - Disable isVisible() check for now - Documented that in _some_ cases it's fine not to call beingDeleted() - Issue #5809: added missing beingDeleted() calls - Add missing <sys/select.h> - Issue #5873: Linking with WT_SOCKET_LIBRARY necessary when including WIOService - Issue #5815: emit input signal when line edit changed (if we have an input mask) - Fix issue where submenu of popupmenu's signals are not exposed - Stop propagation of starttouch/endtouch on menu items so we don't get a document touch This fixes a problem with Safari on iOS where the menu was closed after checking/unchecking an item, causing the item to not be checked/unchecked.
1 parent 99df4a9 commit 470bc74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2506
-839
lines changed

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ SET(WTDBOSQLITE3_SOVERSION 43)
3535
SET(WTDBOPOSTGRES_SOVERSION 43)
3636
SET(WTDBOFIREBIRD_SOVERSION 43)
3737
SET(WTDBOMYSQL_SOVERSION 43)
38+
SET(WTDBOMSSQLSERVER_SOVERSION 43)
3839
SET(WTTEST_SOVERSION 13)
3940

4041
IF(NOT SHARED_LIBS)
@@ -108,6 +109,7 @@ OPTION(ENABLE_SQLITE "Build SQLite3 backend for Wt::Dbo" ON)
108109
OPTION(ENABLE_POSTGRES "Build PostgreSQL backend for Wt::Dbo" ON)
109110
OPTION(ENABLE_FIREBIRD "Build FirebirdSQL backend for Wt::Dbo" ON)
110111
OPTION(ENABLE_MYSQL "Build mariadb/mysql backend for Wt::Dbo" ON)
112+
OPTION(ENABLE_MSSQLSERVER "Build Microsoft SQL Server backend for Wt::Dbo" ON)
111113
OPTION(ENABLE_QT4 "Build Qt4 interworking library (libwtwithqt" ON)
112114
OPTION(ENABLE_LIBWTTEST "Build Wt::Test" ON)
113115
OPTION(ENABLE_LIBWTDBO "Build Wt::Dbo" ON)
@@ -157,6 +159,7 @@ IF(NOT SHARED_LIBS)
157159
SET(WTDBOPOSTGRES_STATIC true)
158160
SET(WTDBOFIREBIRD_STATIC true)
159161
SET(WTDBOMYSQL_STATIC true)
162+
SET(WTDBOMSSQLSERVER_STATIC true)
160163
ENDIF(NOT SHARED_LIBS)
161164

162165
IF(NOT MULTI_THREADED)
@@ -271,6 +274,8 @@ SET(FCGI_PREFIX ${USERLIB_PREFIX} CACHE PATH
271274
"Installation prefix of fcgi library (overrides USERLIB_PREFIX)")
272275
SET(POSTGRES_PREFIX ${USERLIB_PREFIX} CACHE PATH
273276
"Installation prefix of postgresql library (overrides USERLIB_PREFIX)")
277+
SET(ODBC_PREFIX ${USERLIB_PREFIX} CACHE PATH
278+
"Installation prefix of ODBC (unixODBC), required for MS SQL Server, not necessary on Windows (overrides USERLIB_PREFIX)")
274279
SET(FIREBIRD_PREFIX ${USERLIB_PREFIX} CACHE PATH
275280
"Installation prefix of FirebirdSql library. (overrides USERLIB_PREFIX)")
276281
SET(IBPP_SRC_DIRECTORY CACHE PATH
@@ -335,6 +340,7 @@ INCLUDE(cmake/WtFindPng.txt)
335340
INCLUDE(cmake/WtFindSsl.txt)
336341
INCLUDE(cmake/WtFindMysql.txt)
337342
INCLUDE(cmake/WtFindPostgresql.txt)
343+
INCLUDE(cmake/WtFindOdbc.txt)
338344
INCLUDE(cmake/WtFindAsciidoc.txt)
339345
INCLUDE(cmake/WtFindHaru.txt)
340346
INCLUDE(cmake/WtFindGm.txt)

ReleaseNotes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ <h3>Removal of deprecated functionality</h3>
201201
</li>
202202
</ul>
203203

204-
<h2>Release 3.3.8 (August 2017)</h2>
204+
<h2>Release 3.3.8 (August 16, 2017)</h2>
205205
<p>
206206
This release consists of bug fixes and some new features:
207207
</p>

WConfig.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#cmakedefine WTDBOSQLITE3_STATIC
2626
#cmakedefine WTDBOFIREBIRD_STATIC
2727
#cmakedefine WTDBOMYSQL_STATIC
28+
#cmakedefine WTDBOMSSQLSERVER_STATIC
2829
#cmakedefine WTHTTP_STATIC
2930

3031
#cmakedefine WT_HAS_WRASTERIMAGE

cmake/WtFindOdbc.txt

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# This file defines:
2+
# - ODBC_LIBRARIES
3+
# - ODBC_INCLUDE_DIRS
4+
# - ODBC_FOUND
5+
# Taking into account:
6+
# - ODBC_PREFIX
7+
8+
IF(WIN32)
9+
SET(ODBC_LIBRARY Odbc32)
10+
SET(ODBC_LIBRARIES ${ODBC_LIBRARY})
11+
SET(ODBC_INCLUDE "")
12+
SET(ODBC_FOUND TRUE)
13+
ELSE(WIN32)
14+
SET(ODBC_LIBRARY odbc)
15+
16+
FIND_LIBRARY(ODBC_LIB
17+
NAMES
18+
${ODBC_LIBRARY}
19+
PATHS
20+
${ODBC_PREFIX}/lib
21+
${ODBC_PREFIX}
22+
/usr/lib
23+
/usr/lib64
24+
/usr/local/lib
25+
/opt/local/lib
26+
)
27+
28+
SET(ODBC_LIBRARIES ${ODBC_LIB})
29+
30+
FIND_PATH(ODBC_INCLUDE sql.h
31+
${ODBC_PREFIX}/include
32+
/usr/include
33+
/usr/local/include
34+
/opt/local/include
35+
)
36+
37+
SET(ODBC_FOUND FALSE)
38+
39+
IF(ODBC_LIBRARIES AND ODBC_INCLUDE)
40+
SET(ODBC_FOUND TRUE)
41+
SET(ODBC_INCLUDE_DIRS ${ODBC_INCLUDE})
42+
ENDIF(ODBC_LIBRARIES AND ODBC_INCLUDE)
43+
ENDIF(WIN32)

examples/blog/BlogRSSFeed.C

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ BlogRSSFeed::BlogRSSFeed(dbo::SqlConnectionPool& connectionPool,
2929
{ }
3030

3131
BlogRSSFeed::~BlogRSSFeed()
32-
{ }
32+
{
33+
beingDeleted();
34+
}
3335

3436
void BlogRSSFeed::handleRequest(const Wt::Http::Request &request,
3537
Wt::Http::Response &response)

examples/style/CornerImage.C

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ public:
1919
img_(img)
2020
{ }
2121

22+
virtual ~CornerResource()
23+
{
24+
beingDeleted();
25+
}
26+
2227
virtual void handleRequest(const Http::Request& request,
2328
Http::Response& response) {
2429
WRasterImage device("png", img_->radius(), img_->radius());

examples/widgetgallery/approot/src.xml

Lines changed: 436 additions & 431 deletions
Large diffs are not rendered by default.

examples/widgetgallery/examples/PdfRenderer.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ class ReportResource : public Wt::WResource
2424
suggestFileName("report.pdf");
2525
}
2626

27+
virtual ~ReportResource()
28+
{
29+
beingDeleted();
30+
}
31+
2732
virtual void handleRequest(const Wt::Http::Request& request,
2833
Wt::Http::Response& response)
2934
{

src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,9 @@ else (WT_ASIO_IS_STANDALONE_ASIO)
478478
endif (WT_ASIO_IS_STANDALONE_ASIO)
479479

480480
TARGET_LINK_LIBRARIES(wt
481-
PRIVATE
481+
PUBLIC
482482
${WT_SOCKET_LIBRARY}
483+
PRIVATE
483484
${WT_MATH_LIBRARY}
484485
${RT_LIBRARY}
485486
)

src/Wt/Auth/OAuthService.C

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ public:
5252
: process_(process)
5353
{ }
5454

55+
virtual ~OAuthRedirectEndpoint()
56+
{
57+
beingDeleted();
58+
}
59+
5560
void sendError(Http::Response& response)
5661
{
5762
response.setStatus(500);
@@ -527,6 +532,11 @@ struct OAuthService::Impl
527532
: service_(service)
528533
{ }
529534

535+
virtual ~RedirectEndpoint()
536+
{
537+
beingDeleted();
538+
}
539+
530540
virtual void handleRequest(const Http::Request& request,
531541
Http::Response& response) override
532542
{

0 commit comments

Comments
 (0)