fix: use singular association name to generate FK (#16142)

sequelize · Jun 18, 2023 · 8f8f13e · 8f8f13e
1 parent f5a8815
commit 8f8f13e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/packages/core/src/associations/belongs-to.ts b/packages/core/src/associations/belongs-to.ts
@@ -20,7 +20,7 @@ import { Op } from '../operators';
 import { getColumnName } from '../utils/format.js';
 import { isSameInitialModel } from '../utils/model-utils.js';
 import { cloneDeep, removeUndefined } from '../utils/object.js';
-import { camelize, singularize } from '../utils/string.js';
+import { camelize } from '../utils/string.js';
 import { Association } from './base';
 import type { AssociationOptions, SingleAssociationAccessors } from './base';
 import { HasMany } from './has-many.js';
@@ -264,7 +264,7 @@ export class BelongsTo<
   }
 
   protected inferForeignKey(): string {
-    const associationName = singularize(this.options.as);
+    const associationName = this.options.name.singular;
     if (!associationName) {
       throw new Error('Sanity check: Could not guess the name of the association');
     }

diff --git a/packages/core/test/integration/associations/has-one.test.js b/packages/core/test/integration/associations/has-one.test.js
@@ -516,8 +516,11 @@ describe(Support.getTestDialectTeaser('HasOne'), () => {
         });
 
         expect(Object.keys(InternetOrders.getAttributes()).length).to.equal(2);
-        expect(InternetOrders.getAttributes().OrderId).to.be.ok;
-        expect(InternetOrders.getAttributes().OrdersId).not.to.be.ok;
+
+        // The model is named incorrectly.
+        // The modal name should always be singular, so here sequelize assumes that "Orders" is singular
+        expect(InternetOrders.getAttributes().OrdersId).to.be.ok;
+        expect(InternetOrders.getAttributes().OrderId).not.to.be.ok;
       });
     });
   });

diff --git a/packages/core/test/unit/associations/belongs-to.test.ts b/packages/core/test/unit/associations/belongs-to.test.ts
@@ -137,6 +137,22 @@ describe(getTestDialectTeaser('belongsTo'), () => {
     sequelize.addModels([Post, Author]);
   });
 
+  it(`uses the model's singular name to generate the foreign key name`, () => {
+    const Book = sequelize.define('Book', {}, {
+      name: {
+        singular: 'Singular',
+        plural: 'Plural',
+      },
+    });
+
+    const Log = sequelize.define('Log', {}, {});
+
+    Log.belongsTo(Book);
+
+    expect(Log.getAttributes().PluralId).to.not.exist;
+    expect(Log.getAttributes().SingularId).to.exist;
+  });
+
   describe('association hooks', () => {
     let Projects: ModelStatic<any>;
     let Tasks: ModelStatic<any>;