Klaas Freitag
26f068bcab
SocketApi: Properly manage the database connections.
...
Removed the fishy closeDb() method of SqlQuery again.
2014-10-20 17:31:33 +02:00
Markus Goetz
f0dc3725e8
ownSql: Still also use sqlite3 busy handler
2014-10-20 17:26:25 +02:00
Markus Goetz
2de22b408b
SyncEngine: Avoid transaction warning
2014-10-20 17:20:58 +02:00
Klaas Freitag
04b62b139d
Fix compile error and add warning.
2014-10-20 17:10:34 +02:00
Klaas Freitag
2f20f3c65d
SocketApi: Instanziate Object to call QFileInfo::exists
...
QFileInfo on Qt4 does not have static members.
2014-10-20 17:05:14 +02:00
Klaas Freitag
53b3e5af1b
SocketAPI: Use new class SqlQuery to cache the sql queries.
...
This results in better handling of the BUSY condition through SqlQuery.
2014-10-20 16:55:37 +02:00
Markus Goetz
7dbb98c2e5
SyncEngine/SyncJournalDB: Don't keep transactions open
2014-10-20 16:50:55 +02:00
Markus Goetz
8b35cda4c6
SyncEngine: Refactor startSync() code
2014-10-20 15:51:50 +02:00
Markus Goetz
cb36a37779
SyncEngine/SyncJournalDB: Fix creation of .csync_journal
2014-10-20 14:27:00 +02:00
Markus Goetz
704c5f2de7
NetworkJobs: Higher timeout for pre-oC7
...
Pre-oc7 has PHP session locking for PROPFIND (by recursive PROPFIND in csync_update),
the oc7 doesn't.
2014-10-20 13:34:09 +02:00
Klaas Freitag
3fcb0d2d6b
SocketAPI: Properly release precompiled statements. Use sqlite3_close
...
rather than its v2 equivalent. That should make it compile on older
linux platforms.
2014-10-20 10:51:03 +02:00
Klaas Freitag
2dfe0ed42e
Remove unused variable, fixes compile warning.
2014-10-20 10:51:03 +02:00
Daniel Molkentin
ac48fbae9c
1.7.0 beta4
2014-10-20 10:28:47 +02:00
Daniel Molkentin
6048a7143a
Revert "Remove references to qsqlite3"
...
QtWebkit needs it
This reverts commit b1c10c8454
2014-10-20 10:27:34 +02:00
Jenkins for ownCloud
7c24db07c2
[tx-robot] updated from transifex
2014-10-20 01:25:25 -04:00
Daniel Molkentin
271cdac474
Really use internal SQLite on Windows
2014-10-19 08:51:01 +02:00
Jenkins for ownCloud
79e2c132cc
[tx-robot] updated from transifex
2014-10-19 01:25:24 -04:00
Klaas Freitag
b5736fb5a7
Sql: Handle SQLITE_BUSY properly for sqlite3_step and sqlite3_prepare.
...
Repeat the statements a couple of times and sleep in between.
2014-10-18 16:16:29 +02:00
Klaas Freitag
7822a6b000
csync_statedb: Finalize the precompiled statements after discovery.
...
As described in http://www.sqlite.org/cvstrac/wiki?p=MultiThreading precompiled
statements should not be used across thread borders. However, the reconcile
phase would reuse the statements if defined (it calls statedb function from
a different thread) so it is saver to finalize them at the end of the
update run.
2014-10-18 14:18:11 +02:00
Jenkins for ownCloud
306b63599c
[tx-robot] updated from transifex
2014-10-18 01:25:33 -04:00
Daniel Molkentin
3021fb546e
NSIS: Fix copying of qtbase translations
2014-10-17 16:37:37 +02:00
Olivier Goffart
a5bd437d48
Propagator: Fix renaming of files and case confflicts
...
Better fix for #1385 and #2318
2014-10-17 16:15:03 +02:00
Olivier Goffart
08156186fa
Revert "propagator: Do not check for case clash when renaming"
...
This caused test regressions in t8.pl (#2318 )
This reverts commit dad8c1c27c
2014-10-17 16:15:03 +02:00
Markus Goetz
f1006ca8b0
owncloudcmd: Always need exclude list
...
Try to load the system list or the user supplied list.
For #2322
2014-10-17 15:58:01 +02:00
Markus Goetz
93c85711d1
ownSql: Always use finish()
2014-10-17 13:39:48 +02:00
Markus Goetz
e5ef5f2410
Revert "socketapi: if the filename is empty, it's actually /"
...
Not needed, the socketapi checks for "".
This reverts commit 561e3c780d
2014-10-17 13:29:34 +02:00
Daniel Molkentin
52a5729298
Merge pull request #2319 from owncloud/sqlite_capi
...
Introduce a common sqlite layer across csync and mirall.
This avoids conflicts that both each load different and/or updated sqlite versions.
2014-10-17 12:11:27 +02:00
Daniel Molkentin
b9849580f8
ReNautilus Shell Intgration: Remove debug output
2014-10-17 12:09:30 +02:00
Daniel Molkentin
4525161e7c
Updater: allow overriding update URL through environment
2014-10-17 12:07:18 +02:00
Daniel Molkentin
dee6d18d69
Discovery phase: Improve UI by quoting folder names
2014-10-17 12:07:18 +02:00
Daniel Molkentin
d44179142f
Discovery phase: Properly decode percent encoding
2014-10-17 12:07:18 +02:00
Klaas Freitag
c66c01245b
Beautified some debug logging strings.
2014-10-17 11:35:06 +02:00
Jenkins for ownCloud
681c43631b
[tx-robot] updated from transifex
2014-10-17 01:25:34 -04:00
Klaas Freitag
2f740fe471
tests: Added unicode read an write testcase for ownsql.
2014-10-16 21:21:47 +02:00
Markus Goetz
b1c10c8454
Remove references to qsqlite3
2014-10-16 17:51:17 +02:00
Markus Goetz
1d5b3aadea
sqlite3: Bundle 3.8.6 for Mac and Windows
...
it is linked into ocsync.
2014-10-16 17:38:45 +02:00
Markus Goetz
2d420cd72c
ownSql: Always use SQLITE_TRANSIENT
...
More safe.
2014-10-16 15:30:50 +02:00
Markus Goetz
707d6880a8
main: Show console message if already running
2014-10-16 15:25:33 +02:00
Markus Goetz
dbad1a8d45
ownSql: Don't allow copying of SqlQuery
...
This fixes a crash on OS X where the destructor
calls sqlite3 to invalidate the underlying handle.
2014-10-16 15:10:25 +02:00
Klaas Freitag
36eaff92e5
JournalDb: Some Sql statement fixes, make t7 work again.
...
plus some minor fixes.
2014-10-16 11:22:57 +02:00
Klaas Freitag
e51c299937
ownSql: create an null value of an empty string in bindValue.
2014-10-16 11:20:50 +02:00
Klaas Freitag
8c7953a47c
ownSql: Proper initialization of result value plus assert on it.
2014-10-16 11:20:21 +02:00
Daniel Molkentin
4527784905
Second part of #1661
...
- QT_INSTALL_TRANSLATIONS was not defined in Qt5
- Some languages have been split up in multiple qm's. We only need qtbase for now
2014-10-16 11:08:29 +02:00
Klaas Freitag
ee8a93ae9a
ownSql: Proper initialization of errId
2014-10-16 10:39:10 +02:00
Jenkins for ownCloud
6096362052
[tx-robot] updated from transifex
2014-10-16 01:25:36 -04:00
Klaas Freitag
89c51e7649
ownsql: Implement the transaction functions.
2014-10-15 19:47:25 +02:00
Klaas Freitag
6c92076ec3
tx.pl: Adopt test t6.pl to the new way of handling precondition failed.
2014-10-15 19:25:34 +02:00
Olivier Goffart
2bba4134fb
owncloudgui: Fix a small leak
...
The systray icon were not destroyed while qutting
2014-10-15 18:11:52 +02:00
Daniel Molkentin
10175c8d57
Update binary/ sha
2014-10-15 16:52:16 +02:00
Olivier Goffart
7804bf0a9a
Windows Shell Integration: Use the right parametter to SHChangeNotify
2014-10-15 16:47:08 +02:00
