Merge branch 'release/1.4.1' into production

This commit is contained in:
Raymond Feng 2014-06-27 10:29:13 -07:00
commit 34c79fba12
3 changed files with 8 additions and 8 deletions

View File

@ -2,7 +2,7 @@
`loopback-connector-mysql` is the MySQL connector module for [loopback-datasource-juggler](https://github.com/strongloop/loopback-datasource-juggler/).
For complete documentation, see [StrongLoop Documentation | MySQL Connector](http://docs.strongloop.com/display/DOC/MySQL+connector).
For complete documentation, see [StrongLoop Documentation | MySQL Connector](http://docs.strongloop.com/display/LB/MySQL+connector).
## Installation

View File

@ -1,6 +1,6 @@
{
"name": "loopback-connector-mysql",
"version": "1.4.0",
"version": "1.4.1",
"description": "MySQL connector for loopback-datasource-juggler",
"main": "index.js",
"scripts": {
@ -8,14 +8,14 @@
},
"dependencies": {
"loopback-connector": "1.x",
"mysql": "~2.3.0",
"mysql": "~2.3.2",
"async": "~0.9.0",
"debug": "~0.8.0"
"debug": "~1.0.2"
},
"devDependencies": {
"loopback-datasource-juggler": "1.x.x",
"should": "~1.3.0",
"mocha": "~1.18.0",
"mocha": "~1.20.1",
"rc": "~0.4.0"
},
"repository": {

View File

@ -362,7 +362,7 @@ describe('mysql', function () {
function (err, post) {
Post.create({title: 'My Post2', content: 'Hello', stars: 20},
function (err, post) {
Post.find({where: {title: {inq: 'SELECT title from PostWithDefaultId'}}},
Post.find({where: {title: {inq: ['SELECT title from PostWithDefaultId']}}},
function (err, posts) {
should.not.exist(err);
posts.should.have.property('length', 0);
@ -392,7 +392,7 @@ describe('mysql', function () {
function (err, post) {
Post.create({title: 'My Post2', content: 'Hello', stars: 20},
function (err, post) {
Post.find({where: {title: {nin: 'SELECT title from PostWithDefaultId'}}},
Post.find({where: {title: {nin: ['SELECT title from PostWithDefaultId']}}},
function (err, posts) {
should.not.exist(err);
posts.should.have.property('length', 2);
@ -408,7 +408,7 @@ describe('mysql', function () {
function (err, post) {
Post.create({title: 'My Post2', content: 'Hello', stars: 20},
function (err, post) {
Post.find({where: {stars: {inq: 'SELECT title from PostWithDefaultId'}}},
Post.find({where: {stars: {inq: ['SELECT title from PostWithDefaultId']}}},
function (err, posts) {
should.not.exist(err);
posts.should.have.property('length', 0);