Skip to content

Commit

Permalink
Merge branch 'main' into v6
Browse files Browse the repository at this point in the history
  • Loading branch information
WikiRik committed Jun 5, 2023
2 parents 518166d + 08a1286 commit dc0317c
Show file tree
Hide file tree
Showing 4 changed files with 872 additions and 795 deletions.
6 changes: 5 additions & 1 deletion docs/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,14 @@ $ sequelize db:seed:undo:all
```

## I am getting an error when attempting to create a model with an enum type.
The brackets `{}` likely need to be quoted in your shell
The brackets `{}` likely need to be quoted in your shell or there needs to be a space between the values
```
sequelize model:create --name User --attributes role:enum:'{Admin,Guest}'
```
or
```
sequelize model:create --name User --attributes role:enum:'{Admin, Guest}'
```
or possibly
```
sequelize model:create --name User --attributes role:enum:\{Admin,Guest\}
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,27 @@
"yargs": "^16.2.0"
},
"devDependencies": {
"@babel/cli": "7.20.7",
"@babel/core": "7.20.12",
"@babel/preset-env": "7.20.2",
"@babel/register": "7.18.9",
"@commitlint/cli": "17.4.2",
"@commitlint/config-angular": "17.4.2",
"@babel/cli": "7.21.5",
"@babel/core": "7.22.1",
"@babel/preset-env": "7.22.4",
"@babel/register": "7.21.0",
"@commitlint/cli": "17.6.5",
"@commitlint/config-angular": "17.6.5",
"bluebird": "3.7.2",
"eslint": "7.32.0",
"eslint-config-prettier": "8.6.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-prettier": "4.2.1",
"expect.js": "0.3.1",
"gulp": "4.0.2",
"husky": "8.0.3",
"lint-staged": "13.1.0",
"lint-staged": "13.2.2",
"mocha": "9.2.2",
"mysql2": "latest",
"mysql2": "3.2.0",
"pg": "latest",
"pg-hstore": "latest",
"prettier": "2.8.3",
"semver": "7.3.8",
"sequelize": "6.28.0",
"prettier": "2.8.8",
"semver": "7.5.1",
"sequelize": "6.32.0",
"sqlite3": "latest",
"through2": "4.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion src/core/migrator.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export async function getMigrator(type, args) {
migrations: {
params: [sequelize.getQueryInterface(), Sequelize],
path: helpers.path.getPath(type),
pattern: /^(?!.*\.d\.ts$).*\.(cjs|js|ts)$/,
pattern: /^(?!.*\.d\.ts$).*\.(cjs|js|cts|ts)$/,
},
});

Expand Down
Loading

0 comments on commit dc0317c

Please sign in to comment.