fix(query-generator): options.group should be quoted (#8326)

lib/dialects/abstract/query-generator.js

@@ -1138,7 +1138,7 @@ const QueryGenerator = {
 
 
     // Add GROUP BY to sub or main query
     // Add GROUP BY to sub or main query
     if (options.group) {
     if (options.group) {
-      options.group = Array.isArray(options.group) ? options.group.map(t => this.quote(t, model)).join(', ') : options.group;
+      options.group = Array.isArray(options.group) ? options.group.map(t => this.quote(t, model)).join(', ') : this.quote(options.group, model);
       if (subQuery) {
       if (subQuery) {
         subQueryItems.push(' GROUP BY ' + options.group);
         subQueryItems.push(' GROUP BY ' + options.group);
       } else {
       } else {

test/unit/dialects/mysql/query-generator.test.js

@@ -261,9 +261,9 @@ if (dialect === 'mysql') {
           context: QueryGenerator,
           context: QueryGenerator,
           needsSequelize: true
           needsSequelize: true
         }, {
         }, {
-          title: 'single string argument is not quoted',
+          title: 'single string argument should be quoted',
           arguments: ['myTable', {group: 'name'}],
           arguments: ['myTable', {group: 'name'}],
-          expectation: 'SELECT * FROM `myTable` GROUP BY name;',
+          expectation: 'SELECT * FROM `myTable` GROUP BY `name`;',
           context: QueryGenerator
           context: QueryGenerator
         }, {
         }, {
           arguments: ['myTable', { group: ['name'] }],
           arguments: ['myTable', { group: ['name'] }],
@@ -291,7 +291,7 @@ if (dialect === 'mysql') {
           needsSequelize: true
           needsSequelize: true
         }, {
         }, {
           arguments: ['myTable', {group: 'name', order: [['id', 'DESC']]}],
           arguments: ['myTable', {group: 'name', order: [['id', 'DESC']]}],
-          expectation: 'SELECT * FROM `myTable` GROUP BY name ORDER BY `id` DESC;',
+          expectation: 'SELECT * FROM `myTable` GROUP BY `name` ORDER BY `id` DESC;',
           context: QueryGenerator
           context: QueryGenerator
         }, {
         }, {
           title: 'HAVING clause works with where-like hash',
           title: 'HAVING clause works with where-like hash',

test/unit/dialects/postgres/query-generator.test.js

@@ -358,9 +358,9 @@ if (dialect.match(/^postgres/)) {
           context: QueryGenerator,
           context: QueryGenerator,
           needsSequelize: true
           needsSequelize: true
         }, {
         }, {
-          title: 'single string argument is not quoted',
+          title: 'single string argument should be quoted',
           arguments: ['myTable', {group: 'name'}],
           arguments: ['myTable', {group: 'name'}],
-          expectation: 'SELECT * FROM \"myTable\" GROUP BY name;'
+          expectation: 'SELECT * FROM \"myTable\" GROUP BY \"name\";'
         }, {
         }, {
           arguments: ['myTable', {group: ['name']}],
           arguments: ['myTable', {group: ['name']}],
           expectation: 'SELECT * FROM \"myTable\" GROUP BY \"name\";'
           expectation: 'SELECT * FROM \"myTable\" GROUP BY \"name\";'

test/unit/dialects/sqlite/query-generator.test.js

@@ -251,9 +251,9 @@ if (dialect === 'sqlite') {
           context: QueryGenerator,
           context: QueryGenerator,
           needsSequelize: true
           needsSequelize: true
         }, {
         }, {
-          title: 'single string argument is not quoted',
+          title: 'single string argument should be quoted',
           arguments: ['myTable', {group: 'name'}],
           arguments: ['myTable', {group: 'name'}],
-          expectation: 'SELECT * FROM `myTable` GROUP BY name;',
+          expectation: 'SELECT * FROM `myTable` GROUP BY `name`;',
           context: QueryGenerator
           context: QueryGenerator
         }, {
         }, {
           arguments: ['myTable', {group: ['name']}],
           arguments: ['myTable', {group: ['name']}],
@@ -285,7 +285,7 @@ if (dialect === 'sqlite') {
           context: QueryGenerator
           context: QueryGenerator
         }, {
         }, {
           arguments: ['myTable', {group: 'name', order: [['id', 'DESC']]}],
           arguments: ['myTable', {group: 'name', order: [['id', 'DESC']]}],
-          expectation: 'SELECT * FROM `myTable` GROUP BY name ORDER BY `id` DESC;',
+          expectation: 'SELECT * FROM `myTable` GROUP BY `name` ORDER BY `id` DESC;',
           context: QueryGenerator
           context: QueryGenerator
         }, {
         }, {
           title: 'HAVING clause works with where-like hash',
           title: 'HAVING clause works with where-like hash',