Adds point support for all drivers (#221)

Changes unknown property type error to throw a well defined code
dresende · Jul 8, 2013 · 26d88a9 · 26d88a9
1 parent 3da4e00
commit 26d88a9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 8 deletions.
diff --git a/lib/Drivers/DDL/mysql.js b/lib/Drivers/DDL/mysql.js
@@ -1,3 +1,5 @@
+var ErrorCodes = require("../../ErrorCodes");
+
 exports.drop = function (driver, opts, cb) {
 	var i, queries = [], pending;
 
@@ -172,12 +174,14 @@ function buildColumnDefinition(driver, name, prop) {
 			def = driver.query.escapeId(name) + " ENUM (" +
 			       prop.values.map(driver.query.escapeVal.bind(driver.query)) +
 			")";
-      break;
-    case "point":
-      def = driver.query.escapeId(name) + " POINT";
+			break;
+		case "point":
+			def = driver.query.escapeId(name) + " POINT";
 			break;
 		default:
-			throw new Error("Unknown property type: '" + prop.type + "'");
+			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
+				property : prop
+			});
 	}
 	if (prop.required === true) {
 		def += " NOT NULL";

diff --git a/lib/Drivers/DDL/postgres.js b/lib/Drivers/DDL/postgres.js
@@ -1,3 +1,5 @@
+var ErrorCodes = require("../../ErrorCodes");
+
 exports.drop = function (driver, opts, cb) {
 	var i, queries = [], pending;
 
@@ -211,8 +213,13 @@ function buildColumnDefinition(driver, table, name, prop) {
 		case "enum":
 			def = driver.query.escapeId(name) + " " + driver.query.escapeId("enum_" + table + "_" + name);
 			break;
+		case "point":
+			def = driver.query.escapeId(name) + " POINT";
+			break;
 		default:
-			throw new Error("Unknown property type: '" + prop.type + "'");
+			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
+				property : prop
+			});
 	}
 	if (prop.required === true) {
 		def += " NOT NULL";

diff --git a/lib/Drivers/DDL/sqlite.js b/lib/Drivers/DDL/sqlite.js
@@ -1,3 +1,5 @@
+var ErrorCodes = require("../../ErrorCodes");
+
 exports.drop = function (driver, opts, cb) {
 	var i, queries = [], pending;
 
@@ -154,7 +156,9 @@ function buildColumnDefinition(driver, name, prop) {
 			def = driver.query.escapeId(name) + " INTEGER";
 			break;
 		default:
-			throw new Error("Unknown property type: '" + prop.type + "'");
+			throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: '" + prop.type + "'", {
+				property : prop
+			});
 	}
 	if (prop.required === true) {
 		def += " NOT NULL";

diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js
@@ -246,8 +246,8 @@ Driver.prototype.propertyToValue = function (value, property) {
 			return (value) ? 1 : 0;
 		case "object":
 			return JSON.stringify(value);
-    case "point":
-      return function() { return 'POINT(' + value.x + ', ' + value.y + ')'; };
+		case "point":
+			return function() { return 'POINT(' + value.x + ', ' + value.y + ')'; };
 		default:
 			return value;
 	}

diff --git a/lib/Drivers/DML/postgres.js b/lib/Drivers/DML/postgres.js
@@ -265,6 +265,14 @@ Driver.prototype.valueToProperty = function (value, property) {
 				return null;
 			}
 			break;
+		case "point":
+			if (typeof value == "string") {
+				var m = value.match(/\((\-?[\d\.]+)[\s,]+(\-?[\d\.]+)\)/);
+				if (m) {
+					return { x : parseFloat(m[1], 10) , y : parseFloat(m[2], 10) };
+				}
+			}
+			return value;
 		case "number":
 			if (value !== null) {
 				return Number(value);
@@ -278,6 +286,10 @@ Driver.prototype.propertyToValue = function (value, property) {
 	switch (property.type) {
 		case "object":
 			return JSON.stringify(value);
+		case "point":
+			return function () {
+				return "POINT(" + value.x + ', ' + value.y + ")";
+			};
 		default:
 			return value;
 	}