💪 Improve database import logic

Author: skerit

lib/class/document.js

@@ -914,30 +914,57 @@ Document.setMethod(function exportToStream(output) {
  *
  * @return   {Pledge}
  */
-Document.setMethod(function importFromBuffer(buffer) {
+Document.setMethod(function importFromBuffer(buffer, options) {
 
 	var that = this,
 	    pledge = new Pledge();
 
+	if (!options) {
+		options = {};
+	}
+
 	zlib.gunzip(buffer, async function unzipped(err, data) {
 
 		if (err) {
 			return pledge.reject(err);
 		}
 
-		data = JSON.undry(data.toString());
+		try {
+			data = JSON.undry(data.toString());
 
-		that.$main = data;
+			that.$main = data;
 
-		await that.save(null, {
-			validate         : false,
-			override_created : true,
-			set_updated      : false,
-			importing        : true,
-			create           : true, // Force INSERT since we're importing
-		});
+			let save_options = {
+				validate         : false,
+				override_created : true,
+				set_updated      : false,
+				importing        : true,
+			};
 
-		pledge.resolve();
+			// If replace_existing is true, don't force create (allow update)
+			// Otherwise, force INSERT
+			if (!options.replace_existing) {
+				save_options.create = true;
+			}
+
+			await that.save(null, save_options);
+
+			pledge.resolve();
+		} catch (save_err) {
+			// Ensure we have a proper Error object with a message
+			let error = save_err;
+			
+			if (!error) {
+				error = new Error('Unknown error during document import');
+			} else if (!(error instanceof Error)) {
+				// If it's not an Error object, wrap it
+				let message = error.message || error.errmsg || String(error);
+				error = new Error('Import save failed: ' + message);
+				error.originalError = save_err;
+			}
+			
+			pledge.reject(error);
+		}
 	});
 
 	return pledge;

lib/class/import_stream_parser.js

@@ -261,7 +261,7 @@ ImportStreamParser.setMethod(function handlePayload() {
 		this.paused = true;
 		this.pending_import = true;
 
-		this.doc.importFromBuffer(this.value).done(function done(err, result) {
+		this.doc.importFromBuffer(this.value, this.options).done(function done(err, result) {
 
 			that.pending_import = false;