diff --git a/database.json b/database.json index a41cbb26..31879913 100644 --- a/database.json +++ b/database.json @@ -18,6 +18,7 @@ "user": "northwind_user", "password": "theWindi$bl0wing", "host": "localhost", - "database": "northwind" + "database": "northwind", + "multiple-statements": true } } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 64ae6a86..00c3a2d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -108,17 +108,6 @@ "integrity": "sha512-nlK/iyETgafGli8Zh9zJVCTicvU3iajSkRwOh3Hhiva598CMqNJ4NcVCGMTGKpGpTYj/9R8RLzS9NAykSSCqGw==", "dev": true }, - "@types/mysql": { - "version": "github:types/mysql#da645a82afd66419ed439dddf174648aa68ba1f9", - "dev": true - }, - "@types/mysql2": { - "version": "github:types/mysql2#d6495cc0e136ab88863130f1a07566d25e539bc6", - "dev": true, - "requires": { - "@types/mysql": "github:types/mysql#da645a82afd66419ed439dddf174648aa68ba1f9" - } - }, "@types/node": { "version": "9.4.3", "resolved": "https://registry.npmjs.org/@types/node/-/node-9.4.3.tgz", @@ -947,6 +936,12 @@ "semver": "5.5.0" } }, + "db-migrate-plugin-typescript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/db-migrate-plugin-typescript/-/db-migrate-plugin-typescript-2.0.0.tgz", + "integrity": "sha512-I3vWzpXvftOUjC/aPPxTbfW7m0iCacHvB6hcFnvyzWOtERpJtFglRvSqbV1qrAzxyRTtzTmdKFaPZWIpXA70fQ==", + "dev": true + }, "db-migrate-shared": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/db-migrate-shared/-/db-migrate-shared-1.1.3.tgz", diff --git a/package.json b/package.json index c6b9f383..7b518cb7 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "@types/winston": "^2.3.7", "@types/ws": "^4.0.1", "chai": "^4.1.2", + "db-migrate-plugin-typescript": "^2.0.0", "json-typescript": "^1.0.0", "mocha": "^5.0.0", "mocha-typescript": "^1.1.12", diff --git a/scripts/db/migrate/create.sh b/scripts/db/migrate/create.sh index 5a204aa3..59e377c7 100755 --- a/scripts/db/migrate/create.sh +++ b/scripts/db/migrate/create.sh @@ -1,2 +1,2 @@ #!/usr/bin/env sh -./node_modules/.bin/db-migrate create -e sqlite $1 $2 $3 $4 --sql-file \ No newline at end of file +./node_modules/.bin/db-migrate create -e sqlite $1 $2 $3 $4 \ No newline at end of file diff --git a/tslint.json b/tslint.json index 9edc1576..99b75ad6 100644 --- a/tslint.json +++ b/tslint.json @@ -1,9 +1,12 @@ { "extends": "tslint:recommended", "rules": { - "no-unused-variable": [true], + "no-unused-variable": [ + true + ], "no-console": true, - "semicolon": [true, "always"], + "semicolon": false, + "space-before-function-paren": false, "interface-name": false, "trailing-comma": false, "max-line-length": false, @@ -16,7 +19,9 @@ } ], "quotemark": false, - "arrow-parens": [false], + "arrow-parens": [ + false + ], "variable-name": [ true, "ban-keywords", @@ -24,6 +29,8 @@ "allow-leading-underscore" ], "await-promise": true, - "prefer-const": [false] + "prefer-const": [ + false + ] } -} +} \ No newline at end of file