♻️ Change how addIndex ensures compound indexes

Author: skerit

CHANGELOG.md

@@ -11,6 +11,7 @@
 * Add `Alchemy#addModuleSearchPath(path)` method to add custom module search paths
 * Fix SCSS custom importer failing on certain relative paths
 * MongoDB Connection failures are now retried after 5 seconds (configurable via `options.retry_delay`)
+* Change how `addIndex` ensures compound indexes
 
 ## 1.4.0 (2026-01-21)
 

lib/class/schema_client.js

@@ -1079,7 +1079,7 @@ Schema.setMethod(function getFieldNames() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.4.0
+ * @version  1.4.1
  *
  * @param    {string|FieldType}   _field_or_name   Field name, or index name when using `fields` option
  * @param    {Object}             options
@@ -1111,15 +1111,46 @@ Schema.setMethod(function addIndex(_field_or_name, _options) {
 		// When `fields` is provided, the first argument is the index name
 		options.name = _field_or_name;
 
+		// Create the index entry
+		if (this.indexes[options.name] == null) {
+			this.indexes[options.name] = {
+				fields: {},
+				options: options
+			};
+		}
+
+		// Add all fields to the index
 		for (let field_name of options.fields) {
-			this.addIndex(field_name, {
-				name: options.name,
-				unique: options.unique,
-				sparse: options.sparse,
-				order: options.order,
-			});
+			let field = this.getField(field_name);
+
+			if (!field) {
+				throw new Error('Could not find field "' + field_name + '" for compound index "' + options.name + '"');
+			}
+
+			let path = field.path;
+			this.indexes[options.name].fields[path] = options.order || 1;
+			this.index_fields[path] = options;
 		}
 
+		// Now call ensureIndex once with the complete compound index
+		const that = this;
+
+		that.getDatasource().done(function gotDs(err, datasource) {
+			if (err) {
+				throw err;
+			}
+
+			if (datasource.supports('ensure_index') === false) {
+				return;
+			}
+
+			datasource.ensureIndex(that.model_class, that.indexes[options.name], function ensuredIndex(err, result) {
+				if (err) {
+					alchemy.printLog('error', ['Error ensuring compound index', options.name, 'in model', that.model_name], {err: err});
+				}
+			});
+		});
+
 		return;
 	}