Merge pull request #15 from fabrix-app/v1.1

[fix] logging should be able to be turned off
fabrix-app · Aug 9, 2018 · c6bc01f · c6bc01f
2 parents bd2a6eb + f30f8c7
commit c6bc01f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/transformer.ts b/lib/transformer.ts
@@ -209,14 +209,14 @@ export const Transformer = {
     }
     if (config.uri) {
       // Sequelize modify options object
-      return new Sequelize(config.uri, Object.assign({},  config, { logging: logger }))
+      return new Sequelize(config.uri, Object.assign({}, { logging: logger }, config))
     }
     else {
       return new Sequelize(
         config.database,
         config.username || process.env.POSTGRES_USER,
         config.password || process.env.POSTGRES_PASSWORD,
-        Object.assign({}, config, { logging: logger })
+        Object.assign({}, { logging: logger }, config)
       )
     }
   },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/spool-sequelize",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "Spool - Datastore Spool for Sequelize.js http://sequelizejs.com",
   "scripts": {
     "build": "tsc -p ./lib/tsconfig.release.json",