fix: fix incorrect usage of the new connections parameter

src/services/leaderboard-stat-getter.js

@@ -54,8 +54,8 @@ function LeaderboardStatGetter(model, modelRelationship, params, options) {
     LIMIT ${limit}
   `;
 
-
-  this.perform = () => options.connections[0].query(query, {
+  const connection = model.sequelize;
+  this.perform = () => connection.query(query, {
     type: options.Sequelize.QueryTypes.SELECT,
   })
     .then((records) => ({ value: records }));

src/services/line-stat-getter.js

@@ -120,13 +120,13 @@ ${groupByDateFieldFormated}), 'yyyy-MM-dd 00:00:00')`);
   }
 
   function getGroupByDateInterval() {
-    if (isMySQL(options)) {
+    if (isMySQL(model.sequelize)) {
       return [getGroupByDateFieldFormatedForMySQL(timeRange), 'date'];
     }
-    if (isMSSQL(options)) {
+    if (isMSSQL(model.sequelize)) {
       return [getGroupByDateFieldFormatedForMSSQL(timeRange), 'date'];
     }
-    if (isSQLite(options)) {
+    if (isSQLite(model.sequelize)) {
       return [getGroupByDateFieldFormatedForSQLite(timeRange), 'date'];
     }
     return [
@@ -156,7 +156,7 @@ ${groupByDateFieldFormated}), 'yyyy-MM-dd 00:00:00')`);
   function fillEmptyDateInterval(records) {
     if (records.length) {
       let sqlFormat = 'YYYY-MM-DD 00:00:00';
-      if (isSQLite(options) && timeRange === 'week') {
+      if (isSQLite(model.sequelize) && timeRange === 'week') {
         sqlFormat = 'YYYY-WW';
       }
 
@@ -205,11 +205,11 @@ ${groupByDateFieldFormated}), 'yyyy-MM-dd 00:00:00')`);
   }
 
   function getGroupBy() {
-    return isMSSQL(options) ? [getGroupByDateFieldFormatedForMSSQL(timeRange)] : [options.Sequelize.literal('1')];
+    return isMSSQL(model.sequelize) ? [getGroupByDateFieldFormatedForMSSQL(timeRange)] : [options.Sequelize.literal('1')];
   }
 
   function getOrder() {
-    return isMSSQL(options) ? [getGroupByDateFieldFormatedForMSSQL(timeRange)] : [options.Sequelize.literal('1')];
+    return isMSSQL(model.sequelize) ? [getGroupByDateFieldFormatedForMSSQL(timeRange)] : [options.Sequelize.literal('1')];
   }
 
   this.perform = async () => {

src/services/pie-stat-getter.js

@@ -71,7 +71,7 @@ function PieStatGetter(model, params, options) {
   }
 
   function getGroupBy() {
-    return isMSSQL(options) ? [options.Sequelize.col(groupByField)] : [ALIAS_GROUP_BY];
+    return isMSSQL(model.sequelize) ? [options.Sequelize.col(groupByField)] : [ALIAS_GROUP_BY];
   }
 
   function formatResults(records) {

src/services/resources-getter.js

@@ -87,10 +87,10 @@ function ResourcesGetter(model, options, params) {
       // WARNING: Choosing the first connection might generate issues if the model does not
       //          belongs to this database.
       try {
-        const results = await options.connections[0]
-          .query(queryToFilterRecords, {
-            type: options.Sequelize.QueryTypes.SELECT,
-          });
+        const connection = model.sequelize;
+        const results = await connection.query(queryToFilterRecords, {
+          type: options.Sequelize.QueryTypes.SELECT,
+        });
 
         const recordIds = results.map((result) => result[primaryKey] || result.id);
         const condition = { [primaryKey]: {} };

src/services/search-builder.js

@@ -20,7 +20,7 @@ function SearchBuilder(model, opts, params, fieldNamesRequested) {
   function lowerIfNecessary(entry) {
     // NOTICE: MSSQL search is natively case insensitive, do not use the "lower" function for
     //         performance optimization.
-    if (Database.isMSSQL(opts)) { return entry; }
+    if (Database.isMSSQL(model.sequelize)) { return entry; }
     return opts.Sequelize.fn('lower', entry);
   }
 

src/utils/database.js

@@ -1,21 +1,9 @@
-function optionsInvalid(options) {
-  // TODO: This function only works with the connection 0, we should add a index
-  //       parameter in case of multiple database with different dialect.
-  return !(options && options.connections && options.connections[0]
-    && options.connections[0].options && options.connections[0].options.dialect);
+function getConnectionDialect(connection) {
+  return connection.options.dialect;
 }
 
-exports.isMySQL = (options) => {
-  if (optionsInvalid(options)) { return false; }
-  return ['mysql', 'mariadb'].indexOf(options.connections[0].options.dialect) > -1;
-};
+exports.isMySQL = (connection) => ['mysql', 'mariadb'].includes(getConnectionDialect(connection));
 
-exports.isMSSQL = (options) => {
-  if (optionsInvalid(options)) { return false; }
-  return options.connections[0].options.dialect === 'mssql';
-};
+exports.isMSSQL = (connection) => getConnectionDialect(connection) === 'mssql';
 
-exports.isSQLite = (options) => {
-  if (optionsInvalid(options)) { return false; }
-  return options.connections[0].options.dialect === 'sqlite';
-};
+exports.isSQLite = (connection) => getConnectionDialect(connection) === 'sqlite';

test/adapters/sequelize.test.js

@@ -11,7 +11,7 @@ function getField(schema, name) {
   const models = {};
   const sequelizeOptions = {
     Sequelize,
-    connections: [sequelize],
+    connections: { sequelize },
   };
 
   models.user = sequelize.define('user', {

test/databases.js

@@ -11,11 +11,11 @@ class ConnectionManager {
   }
 
   getDialect() {
-    return this.connection && this.connection.options && this.connection.options.dialect;
+    return /^(\w+):\/\//g.exec(this.connectionString)[1];
   }
 
   getPort() {
-    return this.connection && this.connection.options && this.connection.options.port;
+    return /:(\d+)\//g.exec(this.connectionString)[1];
   }
 
   createConnection() {

test/index.test.js

@@ -19,7 +19,7 @@ const HasManyDissociator = require('../src/services/has-many-dissociator');
     const models = {};
     const sequelizeOptions = {
       Sequelize,
-      connections: [sequelize],
+      connections: { sequelize },
     };
 
     models.user = sequelize.define('user', {
@@ -1767,15 +1767,15 @@ const HasManyDissociator = require('../src/services/has-many-dissociator');
             fields: {
               user: 'id,firstName,lastName,username,password,createdAt,updatedAt,resetPasswordToken',
             },
-            page: { number: '2', size: '50' },
+            page: { number: '1', size: '50' },
             sort: '-id',
             segmentQuery: 'select * from users\nwhere id in (100, 102);',
             timezone: 'Europe/Paris',
           };
           try {
             const result = await new ResourcesGetter(models.user, sequelizeOptions, params)
               .perform();
-            expect(result).toHaveLength(2);
+            expect(result[0]).toHaveLength(2);
           } finally {
             connectionManager.closeConnection();
           }