diff --git a/lib/adapters/mongoose.js b/lib/adapters/mongoose.js index 4c0ab333..7e2181ae 100644 --- a/lib/adapters/mongoose.js +++ b/lib/adapters/mongoose.js @@ -44,7 +44,7 @@ MongooseAdapter.prototype.define = function (descr) { var props = {}; Object.keys(descr.properties).forEach(function (key) { props[key] = descr.properties[key].type; - if (props[key].name === 'Text') props[key] = String; + if (props[key].name === 'Text' || props[key].name === 'JSON') props[key] = String; }); var schema = new mongoose.Schema(props); this._models[descr.model.modelName] = mongoose.model(descr.model.modelName, schema); diff --git a/lib/adapters/mysql.js b/lib/adapters/mysql.js index c78d9428..fa31bdcc 100644 --- a/lib/adapters/mysql.js +++ b/lib/adapters/mysql.js @@ -411,6 +411,7 @@ function datatype(p) { var dt = ''; switch (p.type.name) { case 'String': + case 'JSON': dt = 'VARCHAR(' + (p.limit || 255) + ')'; break; case 'Text': diff --git a/lib/adapters/postgres.js b/lib/adapters/postgres.js index e5a4b964..8bbb8d54 100644 --- a/lib/adapters/postgres.js +++ b/lib/adapters/postgres.js @@ -516,6 +516,7 @@ function escape(val) { function datatype(p) { switch (p.type.name) { case 'String': + case 'JSON': return 'varchar'; case 'Text': return 'text'; diff --git a/package.json b/package.json index 649cebd7..19f3b6eb 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,12 @@ { "name": "jugglingdb", "description": "ORM for every database: redis, mysql, neo4j, mongodb, postgres, sqlite", - "version": "0.1.10", + "version": "0.1.11", "author": "Anatoliy Chakkaev ", "contributors": [ { "name": "Anatoliy Chakkaev", "email": "rpm1602@gmail.com" }, { "name": "Julien Guimont", "email": "julien.guimont@gmail.com" }, + { "name": "Joseph Junker", "email": "joseph.jnk@gmail.com" }, { "name": "Henri Bergius", "email": "henri.bergius@iki.fi" }, { "name": "redvulps", "email": "fabopereira@gmail.com" }, { "name": "Felipe Sateler", "email": "fsateler@gmail.com" }, diff --git a/test/postgres_default_values_test.coffee b/test/postgres_default_values_test.coffee index ebe79e6e..c78a97e1 100644 --- a/test/postgres_default_values_test.coffee +++ b/test/postgres_default_values_test.coffee @@ -3,7 +3,7 @@ Schema = juggling.Schema Text = Schema.Text DBNAME = process.env.DBNAME || 'myapp_test' #this db must already exist and will be destroyed -DBUSER = process.env.DBUSER || 'root' +DBUSER = process.env.DBUSER || 'postgres' DBPASS = '' DBENGINE = process.env.DBENGINE || 'postgres' diff --git a/test/postgres_migration_test.coffee b/test/postgres_migration_test.coffee index e7500abd..6e5dfb6c 100644 --- a/test/postgres_migration_test.coffee +++ b/test/postgres_migration_test.coffee @@ -3,7 +3,7 @@ Schema = juggling.Schema Text = Schema.Text DBNAME = process.env.DBNAME || 'myapp_test' #this db must already exist and will be destroyed -DBUSER = process.env.DBUSER || 'root' +DBUSER = process.env.DBUSER || 'postgres' DBPASS = '' DBENGINE = process.env.DBENGINE || 'postgres'