Skip to content

Commit f80dd19

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/mocha-9.1.3
2 parents adad16b + d7a5a9f commit f80dd19

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ export class Shoe extends Model {
854854
## Scopes
855855

856856
Scopes can be defined with annotations as well. The scope options are identical to native
857-
sequelize (See sequelize [docs](https://docs.sequelizejs.com/manual/tutorial/scopes.html) for more details)
857+
sequelize (See sequelize [docs](https://sequelize.org/master/manual/scopes.html) for more details)
858858

859859
### `@DefaultScope` and `@Scopes`
860860

src/model/column/column.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ export function Column(...args: any[]): Function | void {
2424
}
2525

2626
return (target: any, propertyName: string, propertyDescriptor?: PropertyDescriptor) => {
27-
annotate(target, propertyName, propertyDescriptor, args[0]);
27+
annotate(
28+
target,
29+
propertyName,
30+
propertyDescriptor ?? Object.getOwnPropertyDescriptor(target, propertyName),
31+
args[0]
32+
);
2833
};
2934
}
3035

0 commit comments

Comments
 (0)