Merge branch 'master' into production

This commit is contained in:
Raymond Feng 2013-11-20 11:08:53 -08:00
commit 0e15392df8
2 changed files with 4 additions and 4 deletions

View File

@ -3,7 +3,7 @@
*/
var mysql = require('mysql');
var jdb = require('loopback-datasource-juggler');
var juggler = require('loopback-datasource-juggler');
var EnumFactory = require('./enumFactory').EnumFactory;
/**
@ -73,7 +73,7 @@ exports.initialize = function initializeDataSource(dataSource, callback) {
});
// MySQL specific column types
dataSource.constructor.registerType(function Point() {});
juggler.ModelBuilder.registerType(function Point() {});
dataSource.EnumFactory = EnumFactory; // factory for Enums. Note that currently Enums can not be registered.
@ -94,7 +94,7 @@ function MySQL(client, settings) {
this.settings = settings;
}
require('util').inherits(MySQL, jdb.BaseSQL);
require('util').inherits(MySQL, juggler.BaseSQL);
/**
* Execute the sql statement

View File

@ -1,6 +1,6 @@
{
"name": "loopback-connector-mysql",
"version": "1.0.1",
"version": "1.0.2",
"description": "MySQL connector for loopback-datasource-juggler",
"main": "index.js",
"scripts": {