diff options
| author | dan <dan@noemail.net> | 2018-03-14 21:06:58 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2018-03-14 21:06:58 +0000 |
| commit | c0a499eaad8ca1497e321216c20797a46dd27aa1 (patch) | |
| tree | 02fba919fb27b5b4d57f251ddcf108060c0ffa10 /ext/session/test_session.c | |
| parent | a38e6c57bca300d73abaa7ee9718351b8eb18e2e (diff) | |
| download | sqlite-c0a499eaad8ca1497e321216c20797a46dd27aa1.tar.gz sqlite-c0a499eaad8ca1497e321216c20797a46dd27aa1.zip | |
Add largely untested APIs for rebasing changesets.
FossilOrigin-Name: 39915b683b3f8d3bf872af1dede96bf2818b488a8638a1d248395023fc4bd0ef
Diffstat (limited to 'ext/session/test_session.c')
| -rw-r--r-- | ext/session/test_session.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ext/session/test_session.c b/ext/session/test_session.c index dd2d9977a..7b08267b5 100644 --- a/ext/session/test_session.c +++ b/ext/session/test_session.c @@ -761,9 +761,18 @@ static int SQLITE_TCLAPI testSqlite3changesetApply( }else{ sStr.aData = (unsigned char*)pChangeset; sStr.nData = nChangeset; - rc = sqlite3changeset_apply_strm(db, testStreamInput, (void*)&sStr, - (objc==5) ? test_filter_handler : 0, test_conflict_handler, (void *)&ctx - ); + if( bV2==0 ){ + rc = sqlite3changeset_apply_strm(db, testStreamInput, (void*)&sStr, + (objc==5) ? test_filter_handler : 0, + test_conflict_handler, (void *)&ctx + ); + }else{ + rc = sqlite3changeset_apply_v2_strm(db, testStreamInput, (void*)&sStr, + (objc==5) ? test_filter_handler : 0, + test_conflict_handler, (void *)&ctx, + &pRebase, &nRebase + ); + } } if( rc!=SQLITE_OK ){ |