@cloudant/couchbackup 2.10.1-SNAPSHOT-209 → 2.10.1-SNAPSHOT-211

package/app.js

@@ -243,11 +243,11 @@ async function validateBackupDb(dbClient) {
 async function validateRestoreDb(dbClient) {
   try {
     const response = await dbClient.service.getDatabaseInformation({ db: dbClient.dbName });
-    const { doc_count: docCount, doc_del_count: deletedDocCount } = response.result;
+    const { docCount, docDelCount } = response.result;
     // The system databases can have a validation ddoc(s) injected in them on creation.
     // This sets the doc count off, so we just complitely exclude the system databases from this check.
     // The assumption here is that users restoring system databases know what they are doing.
-    if (!dbClient.dbName.startsWith('_') && (docCount !== 0 || deletedDocCount !== 0)) {
+    if (!dbClient.dbName.startsWith('_') && (docCount !== 0 || docDelCount !== 0)) {
       throw new BackupError('DatabaseNotEmpty', `Target database ${dbClient.url}${dbClient.dbName} is not empty. A target database must be a new and empty database.`);
     }
     // good to use

package/includes/restoreMappings.js

@@ -111,19 +111,19 @@ class Restore {
       return { batch, documents: 0 };
     }
     mappingDebug(`Restoring batch ${batch} with ${restoreBatch.docs.length} docs.`);
-    // if we are restoring known revisions, we need to supply new_edits=false
+    // if we are restoring known revisions, we need to supply newEdits=false
     if (restoreBatch.docs[0] && restoreBatch.docs[0]._rev) {
-      restoreBatch.new_edits = false;
-      mappingDebug('Using new_edits false mode.');
+      restoreBatch.newEdits = false;
+      mappingDebug('Using newEdits false mode.');
     }
     try {
       const response = await this.dbClient.service.postBulkDocs({
         db: this.dbClient.dbName,
         bulkDocs: restoreBatch
       });
-      if (!response.result || (restoreBatch.new_edits === false && response.result.length > 0)) {
+      if (!response.result || (restoreBatch.newEdits === false && response.result.length > 0)) {
         mappingDebug(`Some errors restoring batch ${batch}.`);
-        throw new Error(`Error writing batch ${batch} with new_edits:${restoreBatch.new_edits !== false}` +
+        throw new Error(`Error writing batch ${batch} with newEdits:${restoreBatch.newEdits !== false}` +
           ` and ${response.result ? response.result.length : 'unavailable'} items`);
       }
       mappingDebug(`Successfully restored batch ${batch}.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudant/couchbackup",
-  "version": "2.10.1-SNAPSHOT-209",
+  "version": "2.10.1-SNAPSHOT-211",
   "description": "CouchBackup - command-line backup utility for Cloudant/CouchDB",
   "homepage": "https://github.com/IBM/couchbackup",
   "repository": {
@@ -23,7 +23,7 @@
     "node": "^18 || ^20"
   },
   "dependencies": {
-    "@ibm-cloud/cloudant": "0.8.3",
+    "@ibm-cloud/cloudant": "0.9.0",
     "commander": "12.0.0",
     "debug": "4.3.4"
   },