fix(data-types): use proper field name for ARRAY(ENUM) (#13210)

nahog · web-flow · commit 1cfbd333df8f · 2021-06-26T01:50:03.000-03:00
diff --git a/lib/dialects/postgres/data-types.js b/lib/dialects/postgres/data-types.js
@@ -480,7 +480,7 @@ module.exports = BaseTypes => {
 
       if (this.type instanceof BaseTypes.ENUM) {
         castKey = `${Utils.addTicks(
-          Utils.generateEnumName(options.field.Model.getTableName(), options.field.fieldName),
+          Utils.generateEnumName(options.field.Model.getTableName(), options.field.field),
           '"'
         ) }[]`;
       }
diff --git a/test/integration/dialects/postgres/dao.test.js b/test/integration/dialects/postgres/dao.test.js
@@ -437,6 +437,34 @@ if (dialect.match(/^postgres/)) {
           expect(user.permissions).to.deep.equal(['access', 'write']);
         });
 
+        it('should be able to insert a new record even with a redefined field name', async function() {
+          const User = this.sequelize.define('UserEnums', {
+            name: DataTypes.STRING,
+            type: DataTypes.ENUM('A', 'B', 'C'),
+            owners: DataTypes.ARRAY(DataTypes.STRING),
+            specialPermissions: {
+              type: DataTypes.ARRAY(DataTypes.ENUM([
+                'access',
+                'write',
+                'check',
+                'delete'
+              ])),
+              field: 'special_permissions'
+            }
+          });
+
+          await User.sync({ force: true });
+
+          const user = await User.bulkCreate([{
+            name: 'file.exe',
+            type: 'C',
+            owners: ['userA', 'userB'],
+            specialPermissions: ['access', 'write']
+          }]);
+
+          expect(user.length).to.equal(1);
+        });
+
         it('should fail when trying to insert foreign element on ARRAY(ENUM)', async function() {
           const User = this.sequelize.define('UserEnums', {
             name: DataTypes.STRING,

Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ module.exports = BaseTypes => {`
`480`	`480`
`481`	`481`	`if (this.type instanceof BaseTypes.ENUM) {`
`482`	`482`	castKey = `${Utils.addTicks(
`483`		`- Utils.generateEnumName(options.field.Model.getTableName(), options.field.fieldName),`
	`483`	`+ Utils.generateEnumName(options.field.Model.getTableName(), options.field.field),`
`484`	`484`	`'"'`
`485`	`485`	) }[]`;
`486`	`486`	`}`