Commit Graph

541 Commits

Author SHA1 Message Date
Miklos Vajna
e19ee5d6b9 GH #1050 Redis: fix gcc -Wshadow warnings 2016-03-18 14:15:55 +01:00
Guenter Obiltschnig
aec9e25d79 fixed missing } 2016-03-17 11:18:41 +01:00
Guenter Obiltschnig
05db70c37d another fix for #1203: need to reset _rowMap as well. Also, don't hide reset() from base class
Conflicts:
	Data/src/RecordSet.cpp
2016-03-17 10:13:11 +01:00
Guenter Obiltschnig
9911a56da7 removed binaries 2016-03-16 23:18:07 +01:00
Guenter Obiltschnig
1c8f252818 Merge branch 'develop' of https://github.com/pocoproject/poco into develop 2016-03-16 23:17:11 +01:00
Guenter Obiltschnig
9df405b580 fixed GH #1203: Poco::Data::RecordSet should be reusable 2016-03-16 23:15:36 +01:00
Marian Krivoš
66a815ec6b Merge pull request #28 from pocoproject/develop
Sync 14.3.2016
2016-03-14 14:34:08 +01:00
mkrivos
5faec708cd bump to sqlite 3.11.1 2016-03-14 14:09:45 +01:00
FrancisANDRE
01c174a97a Merge remote-tracking branch 'pocoproject@github/develop' into pr/1113 2016-03-13 07:09:07 +01:00
Aleksandar Fabijanic
2301888296 Merge pull request #1177 from pocoproject/pr/1113
Pr/1113 after merging develop
2016-03-12 13:42:50 -08:00
Guenter Obiltschnig
b30da7bcca better logging if rollback fails with Exception 2016-03-12 20:40:39 +01:00
FrancisANDRE
eda8a13b96 Adding <my_glob.h> introduces the macro max with #define max on Linux.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 11:51:13 +01:00
Alex Fabijanic
2a80322ecb merge dev and resolve conflicts 2016-03-11 20:57:28 -08:00
Aleksandar Fabijanic
d49ea8a51b Merge pull request #1189 from mathausmendel/develop
Compilation fixes for AIX (IBM XLC)
2016-03-11 20:39:47 -08:00
Guenter Obiltschnig
c4ca7bb732 another attempt at #1187: retry mysql_stmt_prepare if server has gone away 2016-03-11 14:47:30 +01:00
Mathäus Mendel
8895045fb5 Made all testsuite link with pthreads on Unix systems
This fixes the linker errors due to missing pthreads library on AIX.
2016-03-11 10:30:15 -03:00
Alex Fabijanic
d63c8afbb8 merge develop 2016-03-10 19:33:24 -08:00
FrancisANDRE
dd7455f4e8 Merge remote-tracking branch 'pocoproject/develop' into MySQLOnTravisAndAppVeyor 2016-03-10 23:16:01 +01:00
Guenter Obiltschnig
a42505b9ed fix for #1187: don't send timeout to zero 2016-03-10 21:30:17 +01:00
Alex Fabijanic
e9bc9fe8d4 fix PostgreSQL testsuite Makefile 2016-03-09 19:55:42 -08:00
FrancisANDRE
6121a451a3 Prefix CppUnit include path with Poco/
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-09 17:27:42 +01:00
Alex Fabijanic
422fe0eced CppUnit alignment for PostgreSQL and ODBC Sybase 2016-03-08 14:49:48 -08:00
FrancisANDRE
ec168cad6f Use empty password for root user on Travis.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-08 10:55:14 +01:00
Alex Fabijanic
3eb023132b Merge branch 'develop' into pr/1113
Conflicts:
	Foundation/testsuite/TestSuite_vs120.vcxproj
2016-03-07 21:38:26 -08:00
FrancisANDRE
660cae629b WIP Data/MySQL
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-07 16:06:03 +01:00
Francis ANDRE
29140dbf61 use Poco::NumberParser to convert the port to int 2016-03-07 11:48:45 +01:00
FrancisANDRE
b158ae11db Use getPass instead of getPassword as in MySQL.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-07 08:21:53 +01:00
FrancisANDRE
3e47ae2fb1 Run Data/MySQL on AppVeyor
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-07 08:16:48 +01:00
FrancisANDRE
690104595d Merge remote-tracking branch 'pocoproj@github/develop' into PostgreSQLonTravisAndAppVeyor 2016-03-06 08:24:09 +01:00
FrancisANDRE
26232dfce5 AppVeyor fixes
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-05 17:57:11 +01:00
FrancisANDRE
7f38fc4ef0 Add Data/PostgreSQL to CMake build
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-05 17:55:28 +01:00
Günter Obiltschnig
fd4dcce4b8 Merge pull request #1134 from agalanin/sqlite-named-bind
Data::SQLite: added support for named bind parameters
2016-03-05 15:02:21 +01:00
FrancisANDRE
edbe20a1bd Setup the connection string when needed.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-05 13:57:46 +01:00
FrancisANDRE
6017de3598 AppVeyor CI for Data/PostgreSQL
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-05 11:57:09 +01:00
Guenter Obiltschnig
830894792d fixed GH #1171: Poco::Data::RecordSet: rowCount not reset after execute 2016-03-04 14:06:43 +01:00
Guenter Obiltschnig
634fc133b6 fix leap year issues in testsuites 2016-02-29 10:21:31 +01:00
Alex Fabijanic
86657f38f4 add PostgreSQL and ODBC Sybase tests 2016-02-28 15:11:12 -06:00
Alex Fabijanic
32f3f4a146 merge Data changes (ODBC Sybase, PostgreSQL etc) 2016-02-28 11:06:08 -06:00
Guenter Obiltschnig
266ea3117d fixed GH #1137: Missing 'longint' type in SQLite 2016-02-27 16:31:25 +01:00
Günter Obiltschnig
81e15f393f Merge pull request #1127 from vmiklos/data-wshadow-fixes
GH #1050 Data: fix gcc -Wshadow warnings
2016-02-16 10:03:08 +01:00
Marian Krivos
a75207b2e1 bump to sqlite 3.8.2 2016-02-07 11:33:08 +01:00
Scott Talbert
48111c3809 Guard SQLITE_BUSY_SNAPSHOT which is not available in older SQLite releases
When building POCO unbundled with older versions of SQLite (such as on RHEL7)
SQLITE_BUSY_SNAPSHOT is not defined, so #ifdef guard it.
2016-02-06 20:36:05 -05:00
Alexander Galanin
5608e84af4 Data::SQLite: added support for named bind parameters 2016-01-24 12:53:57 +03:00
Miklos Vajna
6d1a4f20ba GH #1050 Data: fix gcc -Wshadow warnings 2016-01-18 22:52:27 +01:00
FrancisANDRE
ce797f7700 Make CppUnit a component of Poco
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-01-08 00:17:13 +01:00
FrancisANDRE
6e97a9f11b Split tests into samples & tests.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2015-12-19 17:15:55 +01:00
FrancisANDRE
f408331525 Use import libraries for Cygwin.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2015-11-18 19:57:15 +01:00
FrancisANDRE
f56ee9c0ac Restore erased return.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2015-11-18 19:56:21 +01:00
FrancisANDRE
d3d11e25d9 Restore previous version.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2015-11-18 12:34:16 +01:00
FrancisANDRE
75f0819737 IncrementVacuum test commented out since it fails on Travis.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2015-11-18 11:41:23 +01:00