Skip to content

Commit

Permalink
build: update lint configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSchick committed Jul 26, 2019
1 parent 95e5317 commit 7a248d2
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

"jsdoc/check-param-names": "error",
"jsdoc/check-tag-names": "error",
"jsdoc/check-types": "error",
"jsdoc/check-types": "off",
"jsdoc/newline-after-description": "error",
"jsdoc/no-undefined-types": "off",
"jsdoc/require-description-complete-sentence": "off",
Expand Down
4 changes: 2 additions & 2 deletions lib/sequelize.js
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,8 @@ class Sequelize {

options = {
// eslint-disable-next-line no-console
logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
searchPath: this.options.hasOwnProperty('searchPath') ? this.options.searchPath : 'DEFAULT',
logging: 'logging' in this.options ? this.options.logging : console.log,
searchPath: 'searchPath' in this.options ? this.options.searchPath : 'DEFAULT',
...options
};

Expand Down
35 changes: 18 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"debug": "^4.1.1",
"dottie": "^2.0.0",
"inflection": "1.12.0",
"lodash": "^4.17.11",
"lodash": "^4.17.15",
"moment": "^2.24.0",
"moment-timezone": "^0.5.21",
"moment-timezone": "^0.5.26",
"retry-as-promised": "^3.1.0",
"semver": "^6.1.1",
"sequelize-pool": "^2.3.0",
Expand All @@ -46,11 +46,11 @@
"wkx": "^0.4.6"
},
"devDependencies": {
"@commitlint/cli": "^8.0.0",
"@commitlint/config-angular": "^8.0.0",
"@commitlint/cli": "^8.1.0",
"@commitlint/config-angular": "^8.1.0",
"@types/bluebird": "^3.5.26",
"@types/node": "^12.0.8",
"@types/validator": "^10.11.0",
"@types/node": "^12.6.8",
"@types/validator": "^10.11.2",
"big-integer": "^1.6.42",
"chai": "^4.x",
"chai-as-promised": "^7.x",
Expand All @@ -62,26 +62,27 @@
"esdoc-inject-style-plugin": "^1.0.0",
"esdoc-standard-plugin": "^1.0.0",
"eslint": "^6.0.0",
"eslint-plugin-jsdoc": "^8.0.1",
"eslint-plugin-mocha": "^5.2.1",
"husky": "^2.2.0",
"eslint-plugin-jsdoc": "^8.7.0",
"eslint-plugin-mocha": "^6.0.0",
"husky": "^2.7.0",
"js-combinatorics": "^0.5.4",
"lcov-result-merger": "^3.0.0",
"lint-staged": "^8.1.6",
"mariadb": "^2.0.5",
"lint-staged": "^8.2.1",
"mariadb": "^2.1.0",
"markdownlint-cli": "^0.17.0",
"mocha": "^6.1.4",
"mocha": "^6.2.0",
"mysql2": "^1.6.5",
"pg": "^7.11.0",
"nyc": "^14.1.1",
"pg": "^7.12.0",
"pg-hstore": "^2.x",
"pg-types": "^2.0.0",
"pg-types": "^2.1.0",
"rimraf": "^2.6.3",
"semantic-release": "^16.0.0-beta.19",
"sinon": "^7.3.2",
"sinon-chai": "^3.3.0",
"sqlite3": "^4.0.8",
"tedious": "^6.0.0",
"typescript": "^3.3.3333"
"sqlite3": "^4.0.9",
"tedious": "^6.2.0",
"typescript": "^3.5.3"
},
"keywords": [
"mysql",
Expand Down
3 changes: 1 addition & 2 deletions test/unit/sql/create-table.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ const Support = require('../support'),
DataTypes = require('../../../lib/data-types'),
expectsql = Support.expectsql,
current = Support.sequelize,
sql = current.dialect.QueryGenerator,
_ = require('lodash');
sql = current.dialect.QueryGenerator;

describe(Support.getTestDialectTeaser('SQL'), () => {
describe('createTable', () => {
Expand Down

0 comments on commit 7a248d2

Please sign in to comment.