Merge branch 'master' of github.com:gajus/slonik

gajus · May 16, 2019 · b180ebb · b180ebb
2 parents 9198eb6 + b2f2416
commit b180ebb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/factories/createClientConfiguration.js b/src/factories/createClientConfiguration.js
@@ -2,11 +2,13 @@
 
 import type {
   ClientConfigurationType,
-  ClientUserConfigurationType
+  ClientUserConfigurationType,
+  TypeParserType
 } from '../types';
 import createTypeParserPreset from './createTypeParserPreset';
 
 export default (clientUserConfiguration?: ClientUserConfigurationType): ClientConfigurationType => {
+  const typeParsers: $ReadOnlyArray<TypeParserType> = [];
   const configuration = {
     captureStackTrace: true,
     connectionTimeout: 5000,
@@ -18,12 +20,12 @@ export default (clientUserConfiguration?: ClientUserConfigurationType): ClientCo
     maximumPoolSize: 10,
     minimumPoolSize: 0,
 
-    // $FlowFixMe
-    typeParsers: [],
+    typeParsers,
     ...clientUserConfiguration
   };
 
-  if (!configuration.typeParsers || !configuration.typeParsers.length) {
+  if (!configuration.typeParsers || configuration.typeParsers === typeParsers) {
+    // $FlowFixMe
     configuration.typeParsers = createTypeParserPreset();
   }
 

diff --git a/test/slonik/factories/createClientConfiguration.js b/test/slonik/factories/createClientConfiguration.js
@@ -61,3 +61,15 @@ test('overrides provided properties', (t) => {
     }
   );
 });
+
+test('disables default type parsers', (t) => {
+  t.deepEqual(
+    createClientConfiguration({
+      typeParsers: []
+    }),
+    {
+      ...defaultConfiguration,
+      typeParsers: []
+    }
+  );
+});