summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2017-07-24 13:00:11 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2017-07-24 13:00:11 +0200
commit9b134604fad7478b49af1ca52073ee176cd012d3 (patch)
tree1f457b985c1dd86322fc045c052b8cd73e7867f1
parentdd2a4f706f20b83144e637896c55c550afa7030a (diff)
downloadorm-9b134604fad7478b49af1ca52073ee176cd012d3.tar.gz
orm-9b134604fad7478b49af1ca52073ee176cd012d3.zip
update schema
-rw-r--r--models/player_point.js120
-rw-r--r--models/users.js4
-rw-r--r--package-lock.json414
-rw-r--r--package.json3
4 files changed, 74 insertions, 467 deletions
diff --git a/models/player_point.js b/models/player_point.js
index 4f1aae5..ea1d9cc 100644
--- a/models/player_point.js
+++ b/models/player_point.js
@@ -8,6 +8,10 @@ module.exports = function(sequelize, DataTypes) {
primaryKey: true,
autoIncrement: true
},
+ updated_at: {
+ type: DataTypes.DATE,
+ allowNull: false
+ },
player_api_id: {
type: DataTypes.CHAR(36),
allowNull: false
@@ -41,12 +45,24 @@ module.exports = function(sequelize, DataTypes) {
allowNull: true
},
time_spent: {
- type: DataTypes.INTEGER(11),
+ type: DataTypes.BIGINT,
+ allowNull: false
+ },
+ trueskill: {
+ type: "DOUBLE",
allowNull: true
},
- updated_at: {
- type: DataTypes.DATE,
- allowNull: false
+ trueskill_mu: {
+ type: "DOUBLE",
+ allowNull: true
+ },
+ trueskill_sigma: {
+ type: "DOUBLE",
+ allowNull: true
+ },
+ elo: {
+ type: "DOUBLE",
+ allowNull: true
},
kills: {
type: DataTypes.INTEGER(10).UNSIGNED,
@@ -60,6 +76,10 @@ module.exports = function(sequelize, DataTypes) {
type: DataTypes.INTEGER(10).UNSIGNED,
allowNull: true
},
+ farm: {
+ type: "DOUBLE",
+ allowNull: false
+ },
minion_kills: {
type: DataTypes.INTEGER(10).UNSIGNED,
allowNull: true
@@ -92,101 +112,9 @@ module.exports = function(sequelize, DataTypes) {
type: DataTypes.INTEGER(10).UNSIGNED,
allowNull: true
},
- hero_level: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- kda_ratio: {
- type: "DOUBLE(10,5)",
- allowNull: true
- },
- kill_participation: {
- type: "DOUBLE(10,5)",
- allowNull: true
- },
- cs_per_min: {
- type: "DOUBLE(14,5)",
- allowNull: true
- },
- kills_per_min: {
- type: "DOUBLE(12,5)",
- allowNull: true
- },
impact_score: {
type: DataTypes.INTEGER(10).UNSIGNED,
allowNull: true
- },
- objective_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- damage_cp_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- damage_wp_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- sustain_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- farm_lane_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- kill_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- objective_lane_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- farm_jungle_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- peel_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- kill_assist_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- objective_jungle_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- vision_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- heal_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- assist_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- utility_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- synergy_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- build_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
- },
- offmeta_score: {
- type: DataTypes.INTEGER(10).UNSIGNED,
- allowNull: true
}
}, {
tableName: 'player_point',
diff --git a/models/users.js b/models/users.js
index 089b480..b82ba74 100644
--- a/models/users.js
+++ b/models/users.js
@@ -31,6 +31,10 @@ module.exports = function(sequelize, DataTypes) {
remember_token: {
type: DataTypes.STRING(191),
allowNull: true
+ },
+ access_type: {
+ type: DataTypes.ENUM('free','loyal','plus','premium'),
+ allowNull: false
}
}, {
tableName: 'users',
diff --git a/package-lock.json b/package-lock.json
index 6226961..6fef734 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,21 +4,11 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
- "@types/geojson": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.2.tgz",
- "integrity": "sha1-sC0QqwKOKSisWSoFGqpJgaGUHQM="
- },
"ansi-regex": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
},
- "ansicolors": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz",
- "integrity": "sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8="
- },
"async": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
@@ -32,6 +22,11 @@
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
},
+ "bignumber.js": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-3.1.2.tgz",
+ "integrity": "sha1-8725mtUmihX8HwvtL7AY4mk/4jY="
+ },
"bluebird": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
@@ -56,15 +51,6 @@
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
},
- "cardinal": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-1.0.0.tgz",
- "integrity": "sha1-UOIcGwqjdyn5N33vGWtanOyTLuk=",
- "requires": {
- "ansicolors": "0.2.1",
- "redeyed": "1.0.1"
- }
- },
"cliui": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
@@ -85,10 +71,6 @@
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
- "core-util-is": {
- "version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
- "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
- },
"cross-env": {
"version": "https://registry.npmjs.org/cross-env/-/cross-env-3.2.4.tgz",
"integrity": "sha1-ngWF8neGTtQhznVvgamA/w1piro=",
@@ -118,11 +100,6 @@
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
},
- "denque": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/denque/-/denque-1.1.1.tgz",
- "integrity": "sha1-ECKcK4juwb0V/4LF/eNW5762254="
- },
"depd": {
"version": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
"integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM="
@@ -139,11 +116,6 @@
"is-arrayish": "0.2.1"
}
},
- "esprima": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.0.0.tgz",
- "integrity": "sha1-U88kes2ncxPlUcOqLnM0LT+099k="
- },
"fill-keys": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
@@ -179,11 +151,6 @@
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
- "generate-function": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
- "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ="
- },
"generic-pool": {
"version": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz",
"integrity": "sha1-iGvFvwvrfblugby7oHiBjeWmJoM="
@@ -236,11 +203,6 @@
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
"integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg=="
},
- "iconv-lite": {
- "version": "0.4.18",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz",
- "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA=="
- },
"inflection": {
"version": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
"integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY="
@@ -298,6 +260,11 @@
"version": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.0.tgz",
"integrity": "sha1-xh1hAgw+vpkmG3gb09FiI5X1R/g="
},
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+ },
"isexe": {
"version": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
@@ -342,11 +309,6 @@
"version": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
},
- "long": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
- "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s="
- },
"lru-cache": {
"version": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
"integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=",
@@ -401,89 +363,20 @@
"version": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
"integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U="
},
- "mysql2": {
- "version": "1.3.6",
- "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-1.3.6.tgz",
- "integrity": "sha1-1cFJF94LFYAabBiDWZvPb7J8Gh4=",
- "requires": {
- "cardinal": "1.0.0",
- "denque": "1.1.1",
- "generate-function": "2.0.0",
- "iconv-lite": "0.4.18",
- "long": "3.2.0",
- "lru-cache": "4.1.1",
- "named-placeholders": "1.1.1",
- "object-assign": "4.1.1",
- "readable-stream": "2.3.2",
- "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
- "seq-queue": "0.0.5",
- "sqlstring": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.2.0.tgz"
- },
- "dependencies": {
- "isarray": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
- "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
- },
- "lru-cache": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
- "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
- "requires": {
- "pseudomap": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
- "yallist": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"
- }
- },
- "readable-stream": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
- "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
- "requires": {
- "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
- "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
- "isarray": "1.0.0",
- "process-nextick-args": "1.0.7",
- "safe-buffer": "5.1.1",
- "string_decoder": "1.0.3",
- "util-deprecate": "1.0.2"
- },
- "dependencies": {
- "safe-buffer": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
- "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
- }
- }
- },
- "string_decoder": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
- "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
- "requires": {
- "safe-buffer": "5.1.1"
- },
- "dependencies": {
- "safe-buffer": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
- "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
- }
- }
- }
- }
- },
- "named-placeholders": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.1.tgz",
- "integrity": "sha1-O3oNJiA910s6nfTJz7gnsvuQfmQ=",
+ "mysql": {
+ "version": "2.13.0",
+ "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.13.0.tgz",
+ "integrity": "sha1-mY8fjKRuLj3XFJzpgkE2U5hqrkc=",
"requires": {
- "lru-cache": "2.5.0"
+ "bignumber.js": "3.1.2",
+ "readable-stream": "1.1.14",
+ "sqlstring": "2.2.0"
},
"dependencies": {
- "lru-cache": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
- "integrity": "sha1-2COIrpyWC+y+oMc7uet5tsbOmus="
+ "sqlstring": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.2.0.tgz",
+ "integrity": "sha1-wxNcTqirzX5+50GklmqJHYak8ZE="
}
}
},
@@ -508,11 +401,6 @@
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
},
- "object-assign": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
- "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
- },
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -578,11 +466,6 @@
"pinkie": "2.0.4"
}
},
- "process-nextick-args": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
- "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
- },
"proxyquire": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz",
@@ -616,12 +499,27 @@
"read-pkg": "1.1.0"
}
},
- "redeyed": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-1.0.1.tgz",
- "integrity": "sha1-6WwZO0DAgWsArshCaY5hGF5VSYo=",
+ "readable-stream": {
+ "version": "1.1.14",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"requires": {
- "esprima": "3.0.0"
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.3",
+ "isarray": "0.0.1",
+ "string_decoder": "0.10.31"
+ },
+ "dependencies": {
+ "core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+ },
+ "inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+ }
}
},
"request": {
@@ -1082,19 +980,10 @@
"glob": "7.1.2"
}
},
- "safe-buffer": {
- "version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
- "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
- },
"semver": {
"version": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
},
- "seq-queue": {
- "version": "0.0.5",
- "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz",
- "integrity": "sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4="
- },
"sequelize": {
"version": "https://registry.npmjs.org/sequelize/-/sequelize-3.30.4.tgz",
"integrity": "sha1-vaLfHjGFSwmeQUmhEen8Clyh0aQ=",
@@ -1135,215 +1024,6 @@
"yargs": "6.6.0"
}
},
- "sequelize-json": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/sequelize-json/-/sequelize-json-2.1.2.tgz",
- "integrity": "sha1-Qr2a3uCe7w+8hawou8dthqdCzlU=",
- "requires": {
- "sequelize": "3.30.4"
- },
- "dependencies": {
- "cross-env": {
- "version": "3.2.4",
- "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-3.2.4.tgz",
- "integrity": "sha1-ngWF8neGTtQhznVvgamA/w1piro=",
- "requires": {
- "cross-spawn": "5.1.0",
- "is-windows": "1.0.1"
- }
- },
- "cross-spawn": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
- "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
- "requires": {
- "lru-cache": "4.1.1",
- "shebang-command": "1.2.0",
- "which": "1.2.14"
- }
- },
- "debug": {
- "version": "2.6.8",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
- "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "depd": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
- "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM="
- },
- "dottie": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/dottie/-/dottie-1.1.1.tgz",
- "integrity": "sha1-RcKj9IvWUo7u0memmoSOqspvqmo="
- },
- "generic-pool": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz",
- "integrity": "sha1-iGvFvwvrfblugby7oHiBjeWmJoM="
- },
- "inflection": {
- "version": "1.12.0",
- "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
- "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY="
- },
- "is-windows": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz",
- "integrity": "sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk="
- },
- "isexe": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
- "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
- },
- "lodash": {
- "version": "4.12.0",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz",
- "integrity": "sha1-K9bcRqBA9Z5obJcu0h2T3FkFMlg="
- },
- "lru-cache": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
- "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
- "requires": {
- "pseudomap": "1.0.2",
- "yallist": "2.1.2"
- }
- },
- "moment": {
- "version": "2.18.1",
- "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
- "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
- },
- "moment-timezone": {
- "version": "0.5.13",
- "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
- "integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
- "requires": {
- "moment": "2.18.1"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- },
- "pseudomap": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
- "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
- },
- "retry-as-promised": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.2.0.tgz",
- "integrity": "sha1-sEY9f9PPWy/tZFAKtui4pJxbjmw=",
- "requires": {
- "bluebird": "3.5.0",
- "cross-env": "3.2.4",
- "debug": "2.6.8"
- }
- },
- "semver": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
- "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
- },
- "sequelize": {
- "version": "3.30.4",
- "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-3.30.4.tgz",
- "integrity": "sha1-vaLfHjGFSwmeQUmhEen8Clyh0aQ=",
- "requires": {
- "bluebird": "3.5.0",
- "depd": "1.1.0",
- "dottie": "1.1.1",
- "generic-pool": "2.4.2",
- "inflection": "1.12.0",
- "lodash": "4.12.0",
- "moment": "2.18.1",
- "moment-timezone": "0.5.13",
- "retry-as-promised": "2.2.0",
- "semver": "5.3.0",
- "shimmer": "1.1.0",
- "terraformer-wkt-parser": "1.1.2",
- "toposort-class": "1.0.1",
- "uuid": "3.1.0",
- "validator": "5.7.0",
- "wkx": "0.2.0"
- }
- },
- "shebang-command": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
- "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
- "requires": {
- "shebang-regex": "1.0.0"
- }
- },
- "shebang-regex": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
- "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
- },
- "shimmer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.1.0.tgz",
- "integrity": "sha1-l9c3cTf/u6tCVSLkKf4KqJpIizU="
- },
- "terraformer": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.8.tgz",
- "integrity": "sha1-UeCtiXRvzyFh3G9lqnDkI3fItZM=",
- "requires": {
- "@types/geojson": "1.0.2"
- }
- },
- "terraformer-wkt-parser": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.1.2.tgz",
- "integrity": "sha1-M2oMj8gglKWv+DKI9prt7NNpvww=",
- "requires": {
- "terraformer": "1.0.8"
- }
- },
- "toposort-class": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz",
- "integrity": "sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg="
- },
- "uuid": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
- "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
- },
- "validator": {
- "version": "5.7.0",
- "resolved": "https://registry.npmjs.org/validator/-/validator-5.7.0.tgz",
- "integrity": "sha1-eoelgUa2laxIYHEUHAxJ1n2gXlw="
- },
- "which": {
- "version": "1.2.14",
- "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
- "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
- "requires": {
- "isexe": "2.0.0"
- }
- },
- "wkx": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.2.0.tgz",
- "integrity": "sha1-dsJPFqzQzY+TzTSqMx4PeWElboQ="
- },
- "yallist": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
- "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
- }
- }
- },
"set-blocking": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -1387,9 +1067,10 @@
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
"integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc="
},
- "sqlstring": {
- "version": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.2.0.tgz",
- "integrity": "sha1-wxNcTqirzX5+50GklmqJHYak8ZE="
+ "string_decoder": {
+ "version": "0.10.31",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
},
"string-width": {
"version": "1.0.2",
@@ -1432,11 +1113,6 @@
"version": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz",
"integrity": "sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg="
},
- "util-deprecate": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
- "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
- },
"uuid": {
"version": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
"integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
diff --git a/package.json b/package.json
index 3b16211..2c6eb45 100644
--- a/package.json
+++ b/package.json
@@ -10,11 +10,10 @@
"license": "UNLICENSED",
"dependencies": {
"bluebird": "^3.5.0",
- "mysql2": "^1.3.6",
+ "mysql": "^2.13.0",
"request": "^2.81.0",
"request-promise": "^4.2.1",
"sequelize-auto": "^0.4.28",
- "sequelize-json": "^2.1.2",
"sleep-promise": "^2.0.0"
}
}