undo queryBuilder changes

Author: NarrowsProjects

lib/database/utilities/QueryBuilder.js

@@ -397,11 +397,10 @@ class WhereAssociationQueryBuilder extends WhereQueryBuilder {
      * @param {QueryBuilder} queryBuilder The include expression.
      * @param {string} association The target association.
      * @param {string} column The target column.
-     * @param {boolean} required If the association must exist.
      */
-    constructor(sequelize, queryBuilder, association, column, required = true) {
+    constructor(sequelize, queryBuilder, association, column) {
         super(queryBuilder, column);
-        this.required = required;
+
         this._sequelize = sequelize;
 
         this.association = association;
@@ -414,18 +413,13 @@ class WhereAssociationQueryBuilder extends WhereQueryBuilder {
      * @returns {QueryBuilder} The current QueryBuilder instance.
      */
     _op(operation) {
-        const association = this.queryBuilder.options.include?.find(({ association }) => association === this.association);
-
-        if (association) {
-            association.where = { [this.column]: operation };
-            association.required = this.required;
-        } else {
-            this.queryBuilder.include({
-                association: this.association,
-                required: this.required,
-                where: { [this.column]: operation },
-            });
-        }
+        this.queryBuilder.include({
+            association: this.association,
+            required: true,
+            where: {
+                [this.column]: operation,
+            },
+        });
 
         return this.queryBuilder;
     }
@@ -441,8 +435,7 @@ class QueryBuilder {
      */
     constructor(sequelize) {
         this._sequelize = sequelize;
-        this.options = { where: {}, replacements: {}, attributes: [] };
-        this._selectOnly = false;
+        this.options = { where: {}, replacements: {} };
     }
 
     /**
@@ -460,32 +453,6 @@ class QueryBuilder {
         return this;
     }
 
-    /**
-     * Include association for expression lists
-     *
-     * @param {Array<object|function<sequelize, object>>} expressions The include expression list.
-     * @returns {QueryBuilder} this.
-     */
-    includeAll(expressions) {
-        expressions.forEach((expression) => this.include(expression));
-        return this;
-    }
-
-    /**
-     * Pushes raw order objects to  the top level order array
-     *
-     * @param {Array<object|function<sequelize, object>>} orders List of orders to be pushed.
-     * @returns {QueryBuilder} this.
-     */
-    pushOrders(orders) {
-        if (!this.options.order) {
-            this.options.order = [];
-        }
-
-        this.options.order = this.options.order.concat(orders);
-        return this;
-    }
-
     /**
      * The numbers of items to return.
      *
@@ -551,50 +518,16 @@ class QueryBuilder {
      * @return {QueryBuilder} this
      */
     includeAttribute({ query, alias }) {
-        this.options.attributes.push([
+        if (!this.options.attributes) {
+            this.options.attributes = { include: [] };
+        }
+        this.options.attributes.include.push([
             typeof query === 'function' ? query(this._sequelize) : this._sequelize.literal(query),
             alias,
         ]);
         return this;
     }
 
-    /**
-     * Prevents toImplementation from automatically appending all model columns
-     * when no explicit string columns are selected.
-     *
-     * @return {QueryBuilder} this
-     */
-    selectOnly() {
-        this._selectOnly = true;
-        return this;
-    }
-
-    /**
-     * Set which top-level columns to fetch
-     *
-     * @param {string[]} columns The column names to select.
-     * @returns {QueryBuilder} this
-     */
-    selectAttributes(columns) {
-        const existing = this.options.attributes.map((attribute) => {
-            if (Array.isArray(attribute)) {
-                return attribute[1]; // Return the alias instead of the expression
-            }
-
-            return attribute;
-        });
-
-        for (const column of columns) {
-            if (existing.includes(columns)) {
-                throw new Error(`Column ${column} allready exists in attributes: ${existing.join()}`);
-            }
-
-            this.options.attributes.push(column);
-        }
-
-        return this;
-    }
-
     /**
      * Generic Key-Value pair setter.
      *
@@ -621,32 +554,10 @@ class QueryBuilder {
     /**
      * Returns the implementation specific query.
      *
-     * @param {string|Model} model The Sequelize model to reference.
      * @returns {Object} Implementation specific query.
      */
-    toImplementation(model) {
-        const options = { ...this.options };
-        const hasColumns = options.attributes.some((attribute) => typeof attribute === 'string');
-
-        if (!this._selectOnly) {
-            if (!hasColumns) {
-                this.setModel(model);
-                const attributes = Object.keys(this.model.rawAttributes);
-                options.attributes = options.attributes.concat(attributes);
-            }
-        }
-
-        const primaryKey = model.primaryKeyAttribute;
-
-        if (primaryKey) {
-            const alreadyOrdered = options.order?.some(([column]) => column === primaryKey);
-
-            if (!alreadyOrdered) {
-                this.orderBy(primaryKey, 'ASC');
-            }
-        }
-
-        return options;
+    toImplementation() {
+        return this.options;
     }
 
     /**
@@ -715,11 +626,10 @@ class QueryBuilder {
      *
      * @param {string} association The target association.
      * @param {string} column The target column.
-     * @param {boolean} required If the association must exist.
      * @returns {WhereAssociationQueryBuilder} The current QueryBuilder instance.
      */
-    whereAssociation(association, column, required) {
-        return new WhereAssociationQueryBuilder(this._sequelize, this, association, column, required);
+    whereAssociation(association, column) {
+        return new WhereAssociationQueryBuilder(this._sequelize, this, association, column);
     }
 }