Merge branch 'spatial' of github.com:MipMapApp/node-orm2 into MipMapApp-spatial

* 'spatial' of github.com:MipMapApp/node-orm2:
  Adding a test to ensure that point properties are pulled from the database correctly
  save support for point types
  DDL support for POINT types
  Support for 'point' type as a property

Author: dresende

lib/Drivers/DDL/mysql.js

@@ -172,6 +172,9 @@ 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;
 		default:
 			throw new Error("Unknown property type: '" + prop.type + "'");

lib/Drivers/DML/mysql.js

@@ -246,6 +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 + ')'; };
 		default:
 			return value;
 	}

lib/Property.js

@@ -30,7 +30,7 @@ exports.normalize = function (prop, Settings) {
 		prop = { type: "enum", values: prop };
 	}
 
-	if ([ "text", "number", "boolean", "date", "enum", "object", "binary" ].indexOf(prop.type) == -1) {
+	if ([ "text", "number", "boolean", "date", "enum", "object", "binary", "point" ].indexOf(prop.type) == -1) {
 		throw ErrorCodes.generateError(ErrorCodes.NO_SUPPORT, "Unknown property type: " + prop.type);
 	}
 

test/integration2/model-get.js

@@ -276,4 +276,33 @@ describe("Model.get()", function() {
 			});
 		});
 	});
+
+  describe("with a point property type", function() {
+    before(function (done) {
+      Person = db.define("person", {
+        name : String,
+        location: {type: 'point'}
+      });
+
+      ORM.singleton.clear();
+
+      return helper.dropSync(Person, function () {
+        Person.create([{
+          name : "John Doe",
+          location: {x: 51.5177, y: -0.0968}
+        }], done);
+      });
+    });
+
+    it("should deserialize the point to an array", function (done) {
+      Person.get("John Doe", function(err, person) {
+        should.equal(err, null);
+
+        person.location.should.be.an.instanceOf(Object);
+        person.location.should.have.property('x', 51.5177);
+        person.location.should.have.property('y', -0.0968);
+        return done();
+      });
+    });
+  });
 });

test/integration2/model-save.js

@@ -196,4 +196,22 @@ describe("Model.save()", function() {
 			});
 		});
 	});
+
+  describe("with a point property", function () {
+    before(setup({type: 'point'}, null));
+
+    it("should save the instance as a geospatial point", function (done) {
+      var John = new Person({
+        name: {x: 51.5177, y: -0.0968}
+      });
+      John.save(function (err) {
+        should.equal(err, null);
+
+        John.name.should.be.an.instanceOf(Object);
+        John.name.should.have.property('x', 51.5177);
+        John.name.should.have.property('y', -0.0968);
+        return done();
+      });
+    });
+  });
 });

test/integration2/property.js

@@ -61,6 +61,11 @@ describe("Property", function () {
 
 			return done();
 		});
+    it("should accept: 'point'", function(done) {
+      Property.normalize("point", ORM.settings).type.should.equal("point");
+      
+      return done();
+    });
 
 		describe("if not valid", function () {
 			it("should throw", function (done) {