不要怂,就是干,撸起袖子干!

Commit 46d40687 by Jan Aagaard Meier

Merge pull request #5682 from daniel-pedersen/wellknown-to-terraformer

remove dependency on wellknown in favor of terraformer-wkt-parser
2 parents eb6ded28 32994ee4
# Future # Future
- [FIXED] Confirmed that values modified in validation hooks are preserved [#3534](https://github.com/sequelize/sequelize/issues/3534) - [FIXED] Confirmed that values modified in validation hooks are preserved [#3534](https://github.com/sequelize/sequelize/issues/3534)
- [FIXED] Support lower case type names in SQLite [#5482](https://github.com/sequelize/sequelize/issues/5482) - [FIXED] Support lower case type names in SQLite [#5482](https://github.com/sequelize/sequelize/issues/5482)
- [INTERNALS] Removed dependency on wellknown in favor of terraformer-wkt-parser
# 3.20.0 # 3.20.0
- [ADDED] rejectOnEmpty mode [#272](https://github.com/sequelize/sequelize/issues/272) [#5480](https://github.com/sequelize/sequelize/issues/5480) - [ADDED] rejectOnEmpty mode [#272](https://github.com/sequelize/sequelize/issues/272) [#5480](https://github.com/sequelize/sequelize/issues/5480)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
var util = require('util') var util = require('util')
, _ = require('lodash') , _ = require('lodash')
, Wkt = require('wellknown') , Wkt = require('terraformer-wkt-parser')
, sequelizeErrors = require('./errors') , sequelizeErrors = require('./errors')
, warnings = {} , warnings = {}
, Validator = require('validator') , Validator = require('validator')
...@@ -898,7 +898,7 @@ GEOMETRY.prototype.key = GEOMETRY.key = 'GEOMETRY'; ...@@ -898,7 +898,7 @@ GEOMETRY.prototype.key = GEOMETRY.key = 'GEOMETRY';
GEOMETRY.prototype.escape = false; GEOMETRY.prototype.escape = false;
GEOMETRY.prototype.$stringify = function (value) { GEOMETRY.prototype.$stringify = function (value) {
return 'GeomFromText(\'' + Wkt.stringify(value) + '\')'; return 'GeomFromText(\'' + Wkt.convert(value) + '\')';
}; };
/** /**
...@@ -923,7 +923,7 @@ GEOGRAPHY.prototype.key = GEOGRAPHY.key = 'GEOGRAPHY'; ...@@ -923,7 +923,7 @@ GEOGRAPHY.prototype.key = GEOGRAPHY.key = 'GEOGRAPHY';
GEOGRAPHY.prototype.escape = false; GEOGRAPHY.prototype.escape = false;
GEOGRAPHY.prototype.$stringify = function (value) { GEOGRAPHY.prototype.$stringify = function (value) {
return 'GeomFromText(\'' + Wkt.stringify(value) + '\')'; return 'GeomFromText(\'' + Wkt.convert(value) + '\')';
}; };
Object.keys(helpers).forEach(function (helper) { Object.keys(helpers).forEach(function (helper) {
......
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
"retry-as-promised": "^2.0.0", "retry-as-promised": "^2.0.0",
"semver": "^5.0.1", "semver": "^5.0.1",
"shimmer": "1.1.0", "shimmer": "1.1.0",
"terraformer-wkt-parser": "^1.1.0",
"toposort-class": "^1.0.1", "toposort-class": "^1.0.1",
"validator": "^4.6.1", "validator": "^4.6.1",
"wellknown": "^0.4.1",
"wkx": "0.2.0" "wkx": "0.2.0"
}, },
"devDependencies": { "devDependencies": {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!