Fixes the issue introduced by [email protected]

ci/initialize-ci.sh

@@ -37,5 +37,5 @@ echo "--- Starting an instance of OrientDB ---"
 sh -c $ODB_LAUNCHER </dev/null &>/dev/null &
 
 # Wait a bit for OrientDB to finish the initialization phase.
-sleep 7
+sleep 15
 printf "\n=== The CI environment has been initialized ===\n"

lib/connection.js

@@ -500,7 +500,7 @@ module.exports = (function () {
         self = this;
 
     collectionInstance = self.collections[collection];
-    attributes = collectionInstance.attributes;    
+    attributes = collectionInstance.definition;    
 
     _document = new Document(options, attributes, self, 'insert');
 
@@ -557,7 +557,7 @@ module.exports = (function () {
     // Catch errors from building query and return to the callback
     try {
       _query = new Query(options, schema, self.config);
-      _document = new Document(values, attributes, self);
+      _document = new Document(values, collectionInstance.definition, self);
       where = _query.getWhereQuery(collection);
     } catch(e) {
       log.error('Failed to compose update SQL query.', e);

lib/document.js

@@ -121,7 +121,7 @@ Document.prototype.serializeValues = function serializeValues(values) {
         return;
       }
     }
-
+    
     var type = self.schema[schemaKey].type;
 
     var foreignKey = self.schema[schemaKey].foreignKey || false;
@@ -156,9 +156,15 @@ Document.prototype.serializeValues = function serializeValues(values) {
       values[key] = null;
     }
 
+    else if(type === 'json'){
+      if(!values[key]['@type']){
+        values[key]['@type'] = 'd';
+      }
+    }
+
     // TODO: should just be "type === 'binary'" but for some reason type never seems to
     // be equal to 'binary'. Waterline issue?
-    if ((type === 'binary' || !type) && Buffer.isBuffer(values[key])) {
+    else if ((type === 'binary' || !type) && Buffer.isBuffer(values[key])) {
       values[key] = values[key].toString('base64');
     }
   }); 

test/integration-orientdb/bugs/47-schema_with_id.js

@@ -4,7 +4,7 @@ var assert = require('assert'),
 
 var self = this;
 
-describe.only('Bug #47: Schema with id (blueprints like)', function() {
+describe('Bug #47: Schema with id (blueprints like)', function() {
   before(function (done) {
 
     var fixtures = {