revert some prettier formatting

gajus · Oct 19, 2020 · 80c5d69 · 80c5d69
1 parent 008aa0d
commit 80c5d69
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 51 deletions.
diff --git a/src/binders/bindPool.ts b/src/binders/bindPool.ts
@@ -71,10 +71,18 @@ export default (
         clientConfiguration,
         'IMPLICIT_QUERY',
         (connectionLog, connection, boundConnection) => {
-          return boundConnection.copyFromBinary(copyQuery, values, columnTypes);
+          return boundConnection.copyFromBinary(
+            copyQuery,
+            values,
+            columnTypes,
+          );
         },
         (newPool) => {
-          return newPool.copyFromBinary(copyQuery, values, columnTypes);
+          return newPool.copyFromBinary(
+            copyQuery,
+            values,
+            columnTypes,
+          );
         },
       );
     },

diff --git a/src/factories/createMockPool.ts b/src/factories/createMockPool.ts
@@ -15,10 +15,7 @@ import {
 import createClientConfiguration from './createClientConfiguration';
 
 type OverridesType = {
-  readonly query: (
-    sql: string,
-    values: ReadonlyArray<PrimitiveValueExpressionType>,
-  ) => Promise<QueryResultType<QueryResultRowType>>;
+  readonly query: (sql: string, values: ReadonlyArray<PrimitiveValueExpressionType>) => Promise<QueryResultType<QueryResultRowType>>;
 };
 
 export default (

diff --git a/src/factories/createSqlTag.ts b/src/factories/createSqlTag.ts
@@ -62,13 +62,10 @@ export default () => {
       }
 
       if (token === undefined) {
-        log.debug(
-          {
-            index,
-            values,
-          },
-          'bound values',
-        );
+        log.debug({
+          index,
+          values,
+        }, 'bound values');
 
         throw new InvalidInputError('SQL tag cannot be bound an undefined value.');
       } else if (isPrimitiveValueExpression(token)) {
@@ -115,14 +112,18 @@ export default () => {
     });
   };
 
-  sql.binary = (data: Buffer): BinarySqlTokenType => {
+  sql.binary = (
+    data: Buffer,
+  ): BinarySqlTokenType => {
     return deepFreeze({
       data,
       type: BinaryToken,
     });
   };
 
-  sql.identifier = (names: ReadonlyArray<string>): IdentifierSqlTokenType => {
+  sql.identifier = (
+    names: ReadonlyArray<string>,
+  ): IdentifierSqlTokenType => {
     // @todo Replace `type` with a symbol once Flow adds symbol support
     // @see https://github.com/facebook/flow/issues/810
     return deepFreeze({
@@ -131,14 +132,19 @@ export default () => {
     });
   };
 
-  sql.json = (value: SerializableValueType): JsonSqlTokenType => {
+  sql.json = (
+    value: SerializableValueType,
+  ): JsonSqlTokenType => {
     return deepFreeze({
       type: JsonToken,
       value,
     });
   };
 
-  sql.join = (members: ReadonlyArray<ValueExpressionType>, glue: SqlTokenType): ListSqlTokenType => {
+  sql.join = (
+    members: ReadonlyArray<ValueExpressionType>,
+    glue: SqlTokenType,
+  ): ListSqlTokenType => {
     return deepFreeze({
       glue,
       members,

diff --git a/src/routines/createTypeOverrides.ts b/src/routines/createTypeOverrides.ts
@@ -22,7 +22,9 @@ export default async (connection: InternalDatabaseConnectionType, typeParsers: R
   });
 
   const postgresTypes = (
-    await connection.query('SELECT oid, typarray, typname FROM pg_type WHERE typname = ANY($1::text[])', [typeNames])
+    await connection.query('SELECT oid, typarray, typname FROM pg_type WHERE typname = ANY($1::text[])', [
+      typeNames,
+    ])
   ).rows;
 
   for (const typeParser of typeParsers) {
@@ -40,9 +42,10 @@ export default async (connection: InternalDatabaseConnectionType, typeParsers: R
 
     if (postgresType.typarray) {
       typeOverrides.setTypeParser(postgresType.typarray, (arrayValue) => {
-        return parseArray(arrayValue).map((value) => {
-          return typeParser.parse(value);
-        });
+        return parseArray(arrayValue)
+          .map((value) => {
+            return typeParser.parse(value);
+          });
       });
     }
   }

diff --git a/src/routines/executeQuery.ts b/src/routines/executeQuery.ts
@@ -73,13 +73,10 @@ const retryTransaction = async (
       await connection.query('BEGIN');
 
       for (const transactionQuery of transactionQueries) {
-        connectionLogger.trace(
-          {
-            attempt,
-            queryId: transactionQuery.executionContext.queryId,
-          },
-          'retrying query',
-        );
+        connectionLogger.trace({
+          attempt,
+          queryId: transactionQuery.executionContext.queryId,
+        }, 'retrying query');
 
         result = await transactionQuery.executionRoutine(
           connection,
@@ -193,9 +190,7 @@ export default async (
       result = await interceptor.beforeQueryExecution(executionContext, actualQuery);
 
       if (result) {
-        log.info(
-          'beforeQueryExecution interceptor produced a result; short-circuiting query execution using beforeQueryExecution result',
-        );
+        log.info('beforeQueryExecution interceptor produced a result; short-circuiting query execution using beforeQueryExecution result');
 
         return result;
       }
@@ -230,11 +225,7 @@ export default async (
           actualQuery,
         );
       } catch (error) {
-        if (
-          typeof error.code === 'string' &&
-          error.code.startsWith(TRANSACTION_ROLLBACK_ERROR_PREFIX) &&
-          clientConfiguration.transactionRetryLimit > 0
-        ) {
+        if (typeof error.code === 'string' && error.code.startsWith(TRANSACTION_ROLLBACK_ERROR_PREFIX) && clientConfiguration.transactionRetryLimit > 0) {
           result = await retryTransaction(
             connectionLogger,
             connection,
@@ -246,12 +237,9 @@ export default async (
         }
       }
     } catch (error) {
-      log.error(
-        {
-          error: serializeError(error),
-        },
-        'execution routine produced an error',
-      );
+      log.error({
+        error: serializeError(error),
+      }, 'execution routine produced an error');
 
       // 'Connection terminated' refers to node-postgres error.
       // @see https://github.com/brianc/node-postgres/blob/eb076db5d47a29c19d3212feac26cd7b6d257a95/lib/client.js#L199

diff --git a/src/sqlFragmentFactories/createArraySqlFragment.ts b/src/sqlFragmentFactories/createArraySqlFragment.ts
@@ -25,7 +25,9 @@ export default (token: ArraySqlTokenType, greatestParameterPosition: number): Sq
     }
   }
 
-  const values = [token.values];
+  const values = [
+    token.values,
+  ];
 
   placeholderIndex++;
 
@@ -44,15 +46,13 @@ export default (token: ArraySqlTokenType, greatestParameterPosition: number): Sq
   } else if (typeof token.memberType === 'string') {
     sql += escapeIdentifier(token.memberType) + '[]';
   } else {
-    throw new InvalidInputError(
-      'Unsupported `memberType`. `memberType` must be a string or SqlToken of "SLONIK_TOKEN_SQL" type.',
-    );
+    throw new InvalidInputError('Unsupported `memberType`. `memberType` must be a string or SqlToken of "SLONIK_TOKEN_SQL" type.');
   }
 
   return {
     sql,
 
-    // @ts-ignore (is this right?)
+    // @ts-ignore
     values,
   };
 };
diff --git a/src/utilities/normaliseQueryValues.ts b/src/utilities/normaliseQueryValues.ts
@@ -4,10 +4,7 @@ import type {
   PrimitiveValueExpressionType,
 } from '../types';
 
-export default (
-  queryValues: ReadonlyArray<PrimitiveValueExpressionType>,
-  native: boolean,
-): ReadonlyArray<PrimitiveValueExpressionType> => {
+export default (queryValues: ReadonlyArray<PrimitiveValueExpressionType>, native: boolean): ReadonlyArray<PrimitiveValueExpressionType> => {
   if (native && queryValues) {
     const finalValues = [];