bf99306a53
Merge branch 'do_not_close_db_on_done'
2016-04-12 14:36:46 +02:00
41b950b7e6
Don't call reset() on a query after close() #4662
2016-04-12 10:30:46 +02:00
868edb1f0d
SyncJournalDb: Only close the db if the return code is not SQLITE_DONE
...
SQLITE_DONE is the indicator for not more query results, which is a legal
thing and not an error condition.
Also, check _getFileRecordQuery for null pointer, as close() wipes it.
2016-04-11 17:38:16 +02:00
aaf43bd0d3
SyncJournalDb: Handle empty filename and avoid a bogus db query.
2016-04-11 17:36:15 +02:00
648328fbe2
SyncJournalDb: Close the db on error in getFileRecord()
...
The idea is that the next call to any database operation will try to
reopen the database through the checkConnect() method. So even if there
was a disconnect trom the db file, this will reestablish the connection.
2016-04-11 12:40:19 +02:00
7b1f02fcda
SelectiveSync: Verify if the list could be read from journal.
...
If there is a read error from the database while trying to get
the list from database, make sure to not behave badly because
the list is empty.
2016-04-06 15:01:28 +02:00
7bd4f95b8c
SqlQuery: Write NULL when intended #4548
...
In SQLite bindings are not cleared by sqlite3_reset() calls, so
skipping a sqlite3_bind call to create a NULL value doesn't work,
instead the previous value will be written.
To fix this, I clear all bindings in SqlQuery::reset and make sure
to explicitly bind NULL when desired in SqlQuery::bind.
To make sure there's no confusion about SqlQuery::reset and
sqlite3_reset, I rename our method to reset_and_clear_bindings().
2016-03-15 14:38:31 +01:00
cd83772112
SyncJounral: add an index on the error blacklist table
...
https://github.com/owncloud/enterprise/issues/1035
2016-02-11 14:38:38 +01:00
17895f3a30
Win: Fix filesystem detection for exFAT workaround #2701
2016-01-19 10:00:12 +01:00
a25f094c4c
Checksums: Don't reupload if size and checksum are unchanged #3235
...
* Compute the content checksum (in addition to the optional
transmission checksum) during upload (.eml files only)
* Add hook to compute and compare the checksum in csync_update
* Add content checksum to database, remove transmission checksum
2015-11-23 11:59:56 +01:00
25c177ca3b
SyncJournalFileRecord: Remove unused mode field
2015-11-11 09:42:31 +01:00
17dd199cba
Checksums: Treat more carefully in db #4034
...
In particular, preserve them on local rename or remote move.
2015-11-10 15:05:00 +01:00
aaf16ff0e8
SyncJournalDB, clear all the queries before closing the database
2015-10-30 14:03:08 +01:00
496b1e907d
Checksum: Don't lose it on metadata update #3735
...
Also improve tests.
2015-10-28 14:49:55 +01:00
b7823dc648
Checksum: Put checksum type into separate column #3735
2015-10-28 14:46:20 +01:00
dff37e11eb
Propagate: Store computed checksums in db during upload #3735
2015-10-28 09:56:39 +01:00
60b2312ab6
SyncJournal: Add checksumHeader column to metadata table #3735
2015-10-28 09:56:39 +01:00
597d36dcf2
csync_statedb: Use the index in csync_statedb_get_below_path
...
Make an index from the path, and make a query that uses the index
2015-10-21 16:38:26 +02:00
df135a0bb2
Merge branch '2.0'
...
Conflicts:
src/gui/folder.cpp
2015-10-19 10:57:37 +02:00
0d5f2b5d31
Propagator: Reset upload blacklist if a chunk suceeds
...
For #3934
2015-10-16 10:06:45 +02:00
f0e17fd9c0
libtypos comment and message typos for master
2015-10-05 09:05:09 +05:45
2cf29352b8
SyncJournalDB: clear all the prepared query when closing the database
...
Not closing it may keep the file open (issue #3421 )
2015-08-06 14:28:02 +02:00
7b8dc9777e
Sync: Rename ignored file member to _serverHasIgnoredFiles.
...
This should make it more obvious that only the server state about
ignored files is stored in the db.
2015-07-15 15:51:15 +02:00
b0aedef4b0
Sync: Store information about ignored files on the server in database.
...
That allows better handling of remove requests that should not be done
because the directory is not empty on the remote side (as it contains
ignored files).
2015-07-15 15:49:27 +02:00
29fecb029e
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
src/gui/accountsettings.cpp
src/gui/accountsettings.h
2015-06-25 12:30:52 +02:00
deb5e68e15
Ignores: Force a remote discovery after ignore list change #3172
...
The problem was that the modified ignore pattern was not applied
to the parts of the remote tree we simply retrieve from the db
because the folder etag didn't change.
Even worse, if one removed an ignore pattern, the un-ignored
files would not be synced correctly.
With this change, a modification to the ignore list always results
in a full remote discovery. This guarantees that we find un-ignored
files.
2015-06-19 14:58:47 +02:00
e9e11d251f
Fix compilation after merge of the confirm and the new-ui branch
2015-06-10 16:22:14 +02:00
10d9e53159
Confirm feature: Use selective sync in the database
2015-05-26 12:34:07 +02:00
2c67692958
JournalDb: add a table in the db for the selective sync
2015-05-26 12:33:54 +02:00
d148464efe
SyncJournalDb::updateErrorBlacklistEntry: lock the mutext at the beginning
...
The mutex need to be locked before checkConnect, that's what all the other functions are doing
2015-05-20 15:30:19 +02:00
8a39748654
SyncJournalDB: Don't use NULL value
...
Olivier says we should try to not be the same as the possible value
for not existing entries.
2015-05-13 14:57:14 +02:00
3556ed416c
SyncJournalDB: Simplify code
2015-05-13 13:15:53 +02:00
e5e2ce2b22
SyncEngine: Force re-read of folder Etags for upgrades from 1.8.0 and 1.8.1
...
This is a better fix than the previous one for the local-files-missing bug
because it does not depend on the sync run to run fully through.
2015-05-13 12:54:49 +02:00
07ffff3d77
SyncEngine: Fix accidental re-discovery because of broken version table
...
Bug had been triggered by d63abef718
2015-05-05 17:07:13 +02:00
d63abef718
SyncEngine: Handle upgrade case from 1.8.0
...
If 1.8.0 caused missing data in the local tree, this patch gets it
back. For that, the usage of the journal for remote repository is
disabled at the first start.
2015-05-04 13:40:25 +02:00
d986011067
Sync: Fix sync of deletions during 503. #2894
2015-04-08 10:50:08 +02:00
5cdf448693
SyncJournal: Use DELETE journal mode on FAT filesystems. #2693
2015-02-11 14:03:55 +01:00
49021fd96d
SyncJournal: Reset all prepared statements. #2757
...
Makes closing of the database actually release file locks.
2015-01-30 15:35:42 +01:00
43d6dbb0f2
SQL: Add debugging options. #2693
...
OWNCLOUD_SQLITE_JOURNAL_MODE: To use something else than WAL
OWNCLOUD_SQLITE_TEMP_STORE: To test with storing temporaries in memory.
2015-01-29 11:02:01 +01:00
91fce3ea73
Make public API explicit about blacklist kind. #2301
...
'blacklist' can mean the selective sync blacklist or the error
blacklist. Names in public API are now explicit about which
blacklist is meant.
2015-01-16 10:17:19 +01:00
53d5de685c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
79c37f9fe4
Poll Jobs: Properly use DB index
...
Why do we sometimes use 0-based, sometimes 1-based indices?
2014-11-24 11:35:39 +01:00
f275002ebe
Merge branch '1.7'
2014-11-20 12:41:06 +01:00
281c0e1553
Merge branch 'master' into rename_client
...
Conflicts:
CMakeLists.txt
src/gui/main.cpp
src/libsync/accessmanager.cpp
src/libsync/accessmanager.h
src/libsync/owncloudpropagator_p.h
2014-11-12 00:07:59 +01:00
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
6b716683e2
Merge the long PUT Poll URL feature with the new sql backend
2014-11-08 11:09:50 +01:00
f25d175b5d
Merge remote-tracking branch 'origin/1.7'
2014-11-06 19:54:20 +01:00
4e20a02fe5
SyncJournalDB: Add filesize column to metadata.
...
* Alter table to include column.
* Make get/set in SyncJournalDB store and load it.
* Make csync recover the stat_t's size member from it.
2014-10-29 09:53:36 +01:00
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
Klaas Freitag