Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update LiteCore to 3.2.0-94 #3191

Merged
merged 3 commits into from
Sep 12, 2023
Merged

Update LiteCore to 3.2.0-94 #3191

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c81f3d8
LiteCore 3.2.0-94
velicuvlad Sep 11, 2023
4e8dd0c
feedback
velicuvlad Sep 11, 2023
43e6411
typo
velicuvlad Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Objective-C/CBLDatabase.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ - (nullable CBLCollection*) collectionWithName: (NSString*)name
C4Error c4err = {};
C4Collection* c4col = c4db_getCollection(_c4db, spec, &c4err);
if (!c4col) {
if (c4err.code != 0) {
if (c4err.code != kC4ErrorNotFound && c4err.domain == LiteCoreDomain) {
Copy link
Contributor

@pasin pasin Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be

!(c4err.code == kC4ErrorNotFound && c4err.domain == LiteCoreDomain)

or

c4err.code != kC4ErrorNotFound || c4err.domain != LiteCoreDomain

Copy link
Contributor Author

@velicuvlad velicuvlad Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i mistyped ... wanted to be c4err.domain !=

I also didn't know if (!()) is allowed. will modify to that at it is more clear

CBLWarn(Database, @"%@ Failed to get collection: %@.%@ (%d/%d)",
self, scopeName, name, c4err.domain, c4err.code);
convertError(c4err, error);
Expand Down
2 changes: 1 addition & 1 deletion vendor/couchbase-lite-core
Open in desktop
Submodule couchbase-lite-core updated 68 files
+5 −0 .gitignore
+5 −1 C/c4CAPI.cc
+241 −23 C/tests/c4DatabaseTest.cc
+7 −6 C/tests/c4QueryTest.cc
+7 −5 LiteCore/Database/DatabaseImpl+Upgrade.cc
+1 −1 LiteCore/Database/DatabaseImpl.hh
+74 −4 LiteCore/Query/QueryParser.cc
+5 −4 LiteCore/Query/QueryParser.hh
+13 −11 LiteCore/Query/SQLiteQuery.cc
+1 −10 LiteCore/RevTrees/SourceID.hh
+2 −1 LiteCore/RevTrees/Version.hh
+58 −8 LiteCore/Storage/BothKeyStore.cc
+1 −0 LiteCore/Storage/KeyStore.hh
+16 −5 LiteCore/Storage/SQLiteDataFile.cc
+0 −7 LiteCore/Support/HybridClock.cc
+13 −1 LiteCore/Support/HybridClock.hh
+1 −1 LiteCore/Support/Logging.cc
+47 −29 LiteCore/tests/LogEncoderTest.cc
+74 −60 LiteCore/tests/QueryParserTest.cc
+4 −4 Xcode/LiteCore.xcodeproj/project.pbxproj
+1 −1 Xcode/xcconfigs/C4Tests.xcconfig
+1 −1 Xcode/xcconfigs/Project.xcconfig
+1 −1 cmake/platform_base.cmake
+17 −14 docs/C/html/_f_l_expert_8h.html
+25 −23 docs/C/html/_f_l_expert_8h_source.html
+3 −3 docs/C/html/c4_base_8h_source.html
+2 −2 docs/C/html/c4_blob_store_8h_source.html
+2 −2 docs/C/html/c4_certificate_8h_source.html
+2 −2 docs/C/html/c4_collection_8h_source.html
+7 −7 docs/C/html/c4_database_8h_source.html
+1 −0 docs/C/html/c4_database_types_8h.html
+126 −124 docs/C/html/c4_database_types_8h_source.html
+1 −1 docs/C/html/c4_doc_enumerator_8h_source.html
+1 −1 docs/C/html/c4_document_09_fleece_8h_source.html
+4 −1 docs/C/html/c4_document_8h.html
+46 −43 docs/C/html/c4_document_8h_source.html
+1 −1 docs/C/html/c4_document_types_8h_source.html
+216 −221 docs/C/html/c4_error_8h_source.html
+1 −1 docs/C/html/c4_index_8h_source.html
+2 −2 docs/C/html/c4_listener_8h_source.html
+1 −1 docs/C/html/c4_log_8h_source.html
+1 −1 docs/C/html/c4_observer_8h_source.html
+1 −1 docs/C/html/c4_predictive_query_8h_source.html
+4 −4 docs/C/html/c4_query_8h.html
+23 −23 docs/C/html/c4_query_8h_source.html
+42 −42 docs/C/html/c4_replicator_8h_source.html
+4 −4 docs/C/html/c4_replicator_types_8h_source.html
+2 −2 docs/C/html/c4_socket_8h_source.html
+77 −74 docs/C/html/c4_socket_types_8h_source.html
+4 −3 docs/C/html/globals_c.html
+1 −0 docs/C/html/globals_defs.html
+1 −0 docs/C/html/globals_eval.html
+2 −2 docs/C/html/globals_f.html
+2 −1 docs/C/html/globals_func_c.html
+1 −1 docs/C/html/globals_func_f.html
+2 −0 docs/C/html/globals_k.html
+3 −0 docs/C/html/group___database.html
+29 −3 docs/C/html/group___documents.html
+25 −8 docs/C/html/group___obscure.html
+7 −14 docs/C/html/group___querying_d_b.html
+3 −1 docs/C/html/group___replicator.html
+69 −68 docs/C/html/search/all_3.js
+3 −3 docs/C/html/search/all_6.js
+244 −242 docs/C/html/search/all_a.js
+173 −172 docs/C/html/search/enumvalues_1.js
+28 −27 docs/C/html/search/functions_1.js
+1 −1 docs/C/html/search/functions_2.js
+1 −1 vendor/fleece
Loading