Merge pull request #184 from whostolebenfrog/order-by-arrays

Support arrays of orderBy arguments

src/translate.js

@@ -90,8 +90,9 @@ export const relationFieldOnNodeType = ({
   tailParams,
   temporalClauses
 }) => {
-  const arrayFilterParams = _.pickBy(filterParams, param =>
-    Array.isArray(param.value)
+  const arrayFilterParams = _.pickBy(
+    filterParams,
+    (param, keyName) => Array.isArray(param.value) && !('orderBy' === keyName)
   );
 
   const allParams = innerFilterParams(filterParams, temporalArgs);

src/utils.js

@@ -336,24 +336,31 @@ export function computeSkipLimit(selection, variableValues) {
   return `[${offset}..${parseInt(offset) + parseInt(first)}]`;
 }
 
+function orderByStatement(resolveInfo, orderByVar) {
+  const splitIndex = orderByVar.lastIndexOf('_');
+  const order = orderByVar.substring(splitIndex + 1);
+  const orderBy = orderByVar.substring(0, splitIndex);
+  const { variableName } = typeIdentifiers(resolveInfo.returnType);
+  return ` ${variableName}.${orderBy} ${order === 'asc' ? 'ASC' : 'DESC'} `;
+}
+
 export const computeOrderBy = (resolveInfo, selection) => {
-  const orderByVar = argumentValue(
+  const orderByArgs = argumentValue(
     resolveInfo.operation.selectionSet.selections[0],
     'orderBy',
     resolveInfo.variableValues
   );
 
-  if (orderByVar == undefined) {
+  if (orderByArgs == undefined) {
     return '';
-  } else {
-    const splitIndex = orderByVar.lastIndexOf('_');
-    const order = orderByVar.substring(splitIndex + 1);
-    const orderBy = orderByVar.substring(0, splitIndex);
-    const { variableName } = typeIdentifiers(resolveInfo.returnType);
-    return ` ORDER BY ${variableName}.${orderBy} ${
-      order === 'asc' ? 'ASC' : 'DESC'
-    } `;
   }
+
+  const orderByArray = Array.isArray(orderByArgs) ? orderByArgs : [orderByArgs];
+  const orderByStatments = orderByArray.map(orderByVar =>
+    orderByStatement(resolveInfo, orderByVar)
+  );
+
+  return ' ORDER BY' + orderByStatments.join(',');
 };
 
 export const possiblySetFirstId = ({ args, statements, params }) => {