Skip to content

Update iOS TestApp to use 4.0 API #156

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

Merged
merged 5 commits into from
Oct 14, 2025
Merged

Update iOS TestApp to use 4.0 API #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
066736d
use 4.0 API for handlers
velicuvlad Sep 24, 2025
5ecd2d5
adjust maxKeptFile set for regression
velicuvlad Sep 24, 2025
40af2d5
fix max_rotate_count
velicuvlad Sep 25, 2025
ac9249d
readability fix
velicuvlad Sep 25, 2025
34b3881
fix build
velicuvlad Sep 26, 2025
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
8 changes: 8 additions & 0 deletions CBLClient/Apps/CBLTestServer-iOS/CBLTestServer-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "CBLTestServer-iOSTests/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -906,6 +907,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "CBLTestServer-iOSTests/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -930,6 +932,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "CBLTestServer-iOSUITests/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -954,6 +957,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "CBLTestServer-iOSUITests/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1079,6 +1083,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "CBLTestServer-iOSTests/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1103,6 +1108,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "CBLTestServer-iOSUITests/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1214,6 +1220,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "CBLTestServer-iOSTests/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1238,6 +1245,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "CBLTestServer-iOSUITests/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
3 changes: 2 additions & 1 deletion CBLClient/Apps/CBLTestServer-iOS/CBLTestServer-iOS/Server/DataSourceRequestHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ public class DataSourceRequestHandler {
////////////////
case "datasource_database":
let database: Database = args.get(name: "database")!
return DataSource.database(database)
let defaultCol = try database.defaultCollection()
return DataSource.collection(defaultCol)

default:
throw RequestHandlerError.MethodNotFound(method)
Expand Down
77 changes: 44 additions & 33 deletions CBLClient/Apps/CBLTestServer-iOS/CBLTestServer-iOS/Server/DatabaseRequestHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,25 @@ public class DatabaseRequestHandler {

case "database_delete":
let database: Database = (args.get(name:"database"))!
let defaultCol = try database.defaultCollection()
let document: Document = (args.get(name:"document"))!

do {
try database.deleteDocument(document)
try defaultCol.delete(document: document)
} catch {
return error
}

case "database_deleteBulkDocs":
let database: Database = args.get(name:"database")!
let defaultCol = try database.defaultCollection()
let doc_ids: Array<String> = args.get(name: "doc_ids")!

try database.inBatch {
for id in doc_ids {
let document: Document = database.document(withID: id)!
let document: Document = try defaultCol.document(id: id)!
do {
try! database.deleteDocument(document)
try! defaultCol.delete(document: document)
}
}
}
Expand All @@ -78,9 +80,10 @@ public class DatabaseRequestHandler {

case "database_deleteIndex":
let database: Database = (args.get(name:"database"))!
let defaultCol = try database.defaultCollection()
let name: String = (args.get(name: "name"))!

try database.deleteIndex(forName: name)
try defaultCol.deleteIndex(forName: name)

case "database_getName":
let database: Database = args.get(name:"database")!
Expand All @@ -89,16 +92,19 @@ public class DatabaseRequestHandler {

case "database_getDocument":
let database: Database = (args.get(name:"database"))!
let defaultCol = try database.defaultCollection()
let id: String? = args.get(name: "id")
return try database.document(withID: id!)
return try defaultCol.document(id: id!)

case "database_save":
let database: Database = (args.get(name:"database"))!
let defaultCol = try database.defaultCollection()
let document: MutableDocument = args.get(name:"document")!
try database.saveDocument(document)
try defaultCol.save(document: document)

case "database_saveWithConcurrency":
let database: Database = (args.get(name:"database"))!
let defaultCol = try database.defaultCollection()
let document: MutableDocument = args.get(name:"document")!
let concurrencyControlType : String? = args.get(name:"concurrencyControlType")!
var concurrencyType = ConcurrencyControl.lastWriteWins
Expand All @@ -110,10 +116,12 @@ public class DatabaseRequestHandler {
concurrencyType = .lastWriteWins
}
}
try! database.saveDocument(document, concurrencyControl: concurrencyType)

return try defaultCol.save(document: document, concurrencyControl: concurrencyType)

case "database_deleteWithConcurrency":
let database: Database = (args.get(name:"database"))!
let defaultCol = try database.defaultCollection()
let document: Document = (args.get(name:"document"))!
let concurrencyControlType : String? = args.get(name:"concurrencyControlType")!
var concurrencyType = ConcurrencyControl.lastWriteWins
Expand All @@ -125,50 +133,48 @@ public class DatabaseRequestHandler {
concurrencyType = .lastWriteWins
}
}
do {
try database.deleteDocument(document, concurrencyControl: concurrencyType)
} catch {
return error
}
return try defaultCol.delete(document: document, concurrencyControl: concurrencyType)


case "database_purge":
let database: Database = (args.get(name:"database"))!
let defaultCol = try database.defaultCollection()
let document: MutableDocument = args.get(name:"document")!
try! database.purgeDocument(document)
try! defaultCol.purge(document: document)

case "database_contains":
let database: Database = (args.get(name:"database"))!
let defaultCol = try database.defaultCollection()
let id: String = (args.get(name: "id"))!
return try database.document(withID: id) != nil
return try defaultCol.document(id: id) != nil

case "database_getCount":
let database: Database = (args.get(name:"database"))!
return try database.count
let defaultCol = try database.defaultCollection()
return defaultCol.count

case "database_compact":
let database: Database = (args.get(name:"database"))!
return try! database.performMaintenance(type:MaintenanceType.compact)

case "database_addChangeListener":
let database: Database = (args.get(name:"database"))!
let defaultCol = try database.defaultCollection()
var token: ListenerToken? = nil
let docId: String? = (args.get(name:"docId"))
if (docId != nil) {
let changeListener = MyDocumentChangeListener()
token = try database.addDocumentChangeListener(withID: docId!, listener: changeListener.listener)
token = defaultCol.addDocumentChangeListener(id: docId!, listener: changeListener.listener)
} else {
let changeListener = MyDatabaseChangeListener()
token = database.addChangeListener(changeListener.listener)
token = defaultCol.addChangeListener(listener: changeListener.listener)
}

return token

case "database_removeChangeListener":
let database: Database = (args.get(name:"database"))!
let changeListener: ListenerToken = (args.get(name: "changeListener"))!

database.removeChangeListener(withToken: changeListener)
changeListener.remove()

case "database_databaseChangeListenerChangesCount":
let changeListener: MyDatabaseChangeListener = (args.get(name: "changeListener"))!
Expand All @@ -186,7 +192,7 @@ public class DatabaseRequestHandler {
return changeListener.getChanges()

case "database_databaseChangeGetDocumentId":
let change: DatabaseChange = (args.get(name: "change"))!
let change: CollectionChange = (args.get(name: "change"))!

return change.documentIDs

Expand All @@ -201,6 +207,7 @@ public class DatabaseRequestHandler {

case "database_saveDocuments":
let database: Database = args.get(name:"database")!
let defaultCol = try database.defaultCollection()
let documents: Dictionary<String, Dictionary<String, Any>> = args.get(name: "documents")!
try database.inBatch {
for doc in documents {
Expand All @@ -212,13 +219,14 @@ public class DatabaseRequestHandler {
}
let new_data: Dictionary<String, Any> = setDataBlob(data)
let document = MutableDocument(id: id, data: new_data)
try! database.saveDocument(document)
try! defaultCol.save(document: document)

}
}

case "database_updateDocuments":
let database: Database = args.get(name:"database")!
let defaultCol = try database.defaultCollection()
let documents: Dictionary<String, Dictionary<String, Any>> = args.get(name: "documents")!
try database.inBatch {
for doc in documents {
Expand All @@ -228,32 +236,33 @@ public class DatabaseRequestHandler {
data["id"] = id
data.removeValue(forKey: "_id")
}
let updated_doc = database.document(withID: id)!.toMutable()
let updated_doc = try! defaultCol.document(id: id)!.toMutable()
let new_data: Dictionary<String, Any> = setDataBlob(data)
updated_doc.setData(new_data)
try database.saveDocument(updated_doc)
try defaultCol.save(document: updated_doc)
}
}

case "database_updateDocument":

let database: Database = (args.get(name:"database"))!
let defaultCol = try database.defaultCollection()
let data: Dictionary<String, Any> = args.get(name: "data")!
let docId: String = args.get(name: "id")!
let updated_doc = database.document(withID: docId)!.toMutable()
let updated_doc = try! defaultCol.document(id: docId)!.toMutable()
let new_data: Dictionary<String, Any> = setDataBlob(data)

updated_doc.setData(new_data)
try! database.saveDocument(updated_doc)
try! defaultCol.save(document: updated_doc)


case "database_getDocIds":
let database: Database = args.get(name:"database")!
let defaultCol = try database.defaultCollection()
let limit: Int = args.get(name:"limit")!
let offset: Int = args.get(name:"offset")!
let query = QueryBuilder
.select(SelectResult.expression(Meta.id))
.from(DataSource.database(database))
.from(DataSource.collection(defaultCol))
.limit(Expression.int(limit), offset:Expression.int(offset))

var result: [String] = []
Expand All @@ -267,11 +276,12 @@ public class DatabaseRequestHandler {

case "database_getDocuments":
let database: Database = args.get(name:"database")!
let defaultCol = try database.defaultCollection()
let ids: [String] = args.get(name:"ids")!
var documents = [String: [String: Any]]()

for id in ids {
let document: Document? = database.document(withID: id)
let document: Document? = try! defaultCol.document(id: id)
if document != nil{
var dict = document!.toDictionary()
for (key, value) in dict {
Expand Down Expand Up @@ -320,9 +330,10 @@ public class DatabaseRequestHandler {

case "database_queryAllDocuments":
let database: Database = args.get(name:"database")!
let defaultCol = try database.defaultCollection()
let searchQuery = QueryBuilder
.select(SelectResult.all())
.from(DataSource.database(database))
.from(DataSource.collection(defaultCol))

return searchQuery
default:
Expand Down Expand Up @@ -361,13 +372,13 @@ private extension DatabaseRequestHandler {
}

class MyDatabaseChangeListener {
var changes: [DatabaseChange] = []
var changes: [CollectionChange] = []

lazy var listener: (DatabaseChange) -> Void = { (change: DatabaseChange) in
lazy var listener: (CollectionChange) -> Void = { (change: CollectionChange) in
self.changes.append(change)
}

public func getChanges() -> [DatabaseChange] {
public func getChanges() -> [CollectionChange] {
return changes
}
}
3 changes: 2 additions & 1 deletion CBLClient/Apps/CBLTestServer-iOS/CBLTestServer-iOS/Server/DocumentRequestHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,10 @@ public class DocumentRequestHandler {

case "document_delete":
let database: Database = (args.get(name:"database"))!
let defaultCol = try! database.defaultCollection()
let document: MutableDocument = args.get(name:"document")!

try! database.deleteDocument(document)
try! defaultCol.delete(document: document)

case "document_getId":
let document: Document = args.get(name: "document")!
Expand Down
Loading