@strapi/database 4.14.4 → 4.14.6

package/lib/query/helpers/join.js

@@ -1,96 +0,0 @@
-'use strict';
-
-const createPivotJoin = (ctx, { alias, refAlias, joinTable, targetMeta }) => {
-  const { qb } = ctx;
-  const joinAlias = qb.getAlias();
-  qb.join({
-    alias: joinAlias,
-    referencedTable: joinTable.name,
-    referencedColumn: joinTable.joinColumn.name,
-    rootColumn: joinTable.joinColumn.referencedColumn,
-    rootTable: alias,
-    on: joinTable.on,
-  });
-
-  const subAlias = refAlias || qb.getAlias();
-  qb.join({
-    alias: subAlias,
-    referencedTable: targetMeta.tableName,
-    referencedColumn: joinTable.inverseJoinColumn.referencedColumn,
-    rootColumn: joinTable.inverseJoinColumn.name,
-    rootTable: joinAlias,
-  });
-
-  return subAlias;
-};
-
-const createJoin = (ctx, { alias, refAlias, attributeName, attribute }) => {
-  const { db, qb } = ctx;
-
-  if (attribute.type !== 'relation') {
-    throw new Error(`Cannot join on non relational field ${attributeName}`);
-  }
-
-  const targetMeta = db.metadata.get(attribute.target);
-
-  const { joinColumn } = attribute;
-
-  if (joinColumn) {
-    const subAlias = refAlias || qb.getAlias();
-    qb.join({
-      alias: subAlias,
-      referencedTable: targetMeta.tableName,
-      referencedColumn: joinColumn.referencedColumn,
-      rootColumn: joinColumn.name,
-      rootTable: alias,
-    });
-    return subAlias;
-  }
-
-  const { joinTable } = attribute;
-  if (joinTable) {
-    return createPivotJoin(ctx, { alias, refAlias, joinTable, targetMeta });
-  }
-
-  return alias;
-};
-
-// TODO: toColumnName for orderBy & on
-const applyJoin = (qb, join) => {
-  const {
-    method = 'leftJoin',
-    alias,
-    referencedTable,
-    referencedColumn,
-    rootColumn,
-    rootTable = qb.alias,
-    on,
-    orderBy,
-  } = join;
-
-  qb[method](`${referencedTable} as ${alias}`, (inner) => {
-    inner.on(`${rootTable}.${rootColumn}`, `${alias}.${referencedColumn}`);
-
-    if (on) {
-      for (const key of Object.keys(on)) {
-        inner.onVal(`${alias}.${key}`, on[key]);
-      }
-    }
-  });
-
-  if (orderBy) {
-    Object.keys(orderBy).forEach((column) => {
-      const direction = orderBy[column];
-      qb.orderBy(`${alias}.${column}`, direction);
-    });
-  }
-};
-
-const applyJoins = (qb, joins) => joins.forEach((join) => applyJoin(qb, join));
-
-module.exports = {
-  createJoin,
-  createPivotJoin,
-  applyJoins,
-  applyJoin,
-};

package/lib/query/helpers/order-by.js

@@ -1,70 +0,0 @@
-'use strict';
-
-const _ = require('lodash/fp');
-
-const types = require('../../types');
-const { createJoin } = require('./join');
-const { toColumnName } = require('./transform');
-
-const processOrderBy = (orderBy, ctx) => {
-  const { db, uid, qb, alias } = ctx;
-  const meta = db.metadata.get(uid);
-  const { attributes } = meta;
-
-  if (typeof orderBy === 'string') {
-    const attribute = attributes[orderBy];
-
-    if (!attribute) {
-      throw new Error(`Attribute ${orderBy} not found on model ${uid}`);
-    }
-
-    const columnName = toColumnName(meta, orderBy);
-
-    return [{ column: qb.aliasColumn(columnName, alias) }];
-  }
-
-  if (Array.isArray(orderBy)) {
-    return orderBy.flatMap((value) => processOrderBy(value, ctx));
-  }
-
-  if (_.isPlainObject(orderBy)) {
-    return Object.entries(orderBy).flatMap(([key, direction]) => {
-      const value = orderBy[key];
-      const attribute = attributes[key];
-
-      if (!attribute) {
-        throw new Error(`Attribute ${key} not found on model ${uid}`);
-      }
-
-      if (types.isScalar(attribute.type)) {
-        const columnName = toColumnName(meta, key);
-
-        return { column: qb.aliasColumn(columnName, alias), order: direction };
-      }
-
-      if (attribute.type === 'relation') {
-        const subAlias = createJoin(ctx, {
-          alias: alias || qb.alias,
-          uid,
-          attributeName: key,
-          attribute,
-        });
-
-        return processOrderBy(value, {
-          db,
-          qb,
-          alias: subAlias,
-          uid: attribute.target,
-        });
-      }
-
-      throw new Error(`You cannot order on ${attribute.type} types`);
-    });
-  }
-
-  throw new Error('Invalid orderBy syntax');
-};
-
-module.exports = {
-  processOrderBy,
-};