Skip to content

Commit dc0317c

Browse files
committed
Merge branch 'main' into v6
2 parents 518166d + 08a1286 commit dc0317c

File tree

4 files changed

+872
-795
lines changed

4 files changed

+872
-795
lines changed

Diff for: docs/FAQ.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,14 @@ $ sequelize db:seed:undo:all
4343
```
4444

4545
## I am getting an error when attempting to create a model with an enum type.
46-
The brackets `{}` likely need to be quoted in your shell
46+
The brackets `{}` likely need to be quoted in your shell or there needs to be a space between the values
4747
```
4848
sequelize model:create --name User --attributes role:enum:'{Admin,Guest}'
4949
```
50+
or
51+
```
52+
sequelize model:create --name User --attributes role:enum:'{Admin, Guest}'
53+
```
5054
or possibly
5155
```
5256
sequelize model:create --name User --attributes role:enum:\{Admin,Guest\}

Diff for: package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@
2121
"yargs": "^16.2.0"
2222
},
2323
"devDependencies": {
24-
"@babel/cli": "7.20.7",
25-
"@babel/core": "7.20.12",
26-
"@babel/preset-env": "7.20.2",
27-
"@babel/register": "7.18.9",
28-
"@commitlint/cli": "17.4.2",
29-
"@commitlint/config-angular": "17.4.2",
24+
"@babel/cli": "7.21.5",
25+
"@babel/core": "7.22.1",
26+
"@babel/preset-env": "7.22.4",
27+
"@babel/register": "7.21.0",
28+
"@commitlint/cli": "17.6.5",
29+
"@commitlint/config-angular": "17.6.5",
3030
"bluebird": "3.7.2",
3131
"eslint": "7.32.0",
32-
"eslint-config-prettier": "8.6.0",
32+
"eslint-config-prettier": "8.8.0",
3333
"eslint-plugin-prettier": "4.2.1",
3434
"expect.js": "0.3.1",
3535
"gulp": "4.0.2",
3636
"husky": "8.0.3",
37-
"lint-staged": "13.1.0",
37+
"lint-staged": "13.2.2",
3838
"mocha": "9.2.2",
39-
"mysql2": "latest",
39+
"mysql2": "3.2.0",
4040
"pg": "latest",
4141
"pg-hstore": "latest",
42-
"prettier": "2.8.3",
43-
"semver": "7.3.8",
44-
"sequelize": "6.28.0",
42+
"prettier": "2.8.8",
43+
"semver": "7.5.1",
44+
"sequelize": "6.32.0",
4545
"sqlite3": "latest",
4646
"through2": "4.0.2"
4747
},

Diff for: src/core/migrator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export async function getMigrator(type, args) {
4646
migrations: {
4747
params: [sequelize.getQueryInterface(), Sequelize],
4848
path: helpers.path.getPath(type),
49-
pattern: /^(?!.*\.d\.ts$).*\.(cjs|js|ts)$/,
49+
pattern: /^(?!.*\.d\.ts$).*\.(cjs|js|cts|ts)$/,
5050
},
5151
});
5252

0 commit comments

Comments
 (0)