verdnatura-mirror
/
loopback-connector-mysql
mirror of https://github.com/loopbackio/loopback-connector-mysql.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60 from serkanserttop/fix-inherit-schema-from-datasource 

Inherit Schema From DataSource if not defined
This commit is contained in:
Raymond Feng 2015-01-14 14:48:22 -08:00
parent cd3fbd5a29 78476b5a9a
commit de299aed9f
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/discovery.js
View File

@ -177,6 +177,9 @@ function mixinDiscovery(MySQL) {
MySQL.prototype.discoverModelProperties = function (table, options, cb) { MySQL.prototype.discoverModelProperties = function (table, options, cb) {
var args = getArgs(table, options, cb); var args = getArgs(table, options, cb);
var owner = args.owner; var owner = args.owner;
if(!owner){
owner = inheritOwnerViaDataSource.call(this);
}
table = args.table; table = args.table;
options = args.options; options = args.options;
cb = args.cb; cb = args.cb;
@ -228,6 +231,9 @@ function mixinDiscovery(MySQL) {
MySQL.prototype.discoverPrimaryKeys = function (table, options, cb) { MySQL.prototype.discoverPrimaryKeys = function (table, options, cb) {
var args = getArgs(table, options, cb); var args = getArgs(table, options, cb);
var owner = args.owner; var owner = args.owner;
if(!owner){
owner = inheritOwnerViaDataSource.call(this);
}
table = args.table; table = args.table;
options = args.options; options = args.options;
cb = args.cb; cb = args.cb;
@ -269,6 +275,9 @@ function mixinDiscovery(MySQL) {
MySQL.prototype.discoverForeignKeys = function (table, options, cb) { MySQL.prototype.discoverForeignKeys = function (table, options, cb) {
var args = getArgs(table, options, cb); var args = getArgs(table, options, cb);
var owner = args.owner; var owner = args.owner;
if(!owner){
owner = inheritOwnerViaDataSource.call(this);
}
table = args.table; table = args.table;
options = args.options; options = args.options;
cb = args.cb; cb = args.cb;
@ -312,6 +321,9 @@ function mixinDiscovery(MySQL) {
MySQL.prototype.discoverExportedForeignKeys = function (table, options, cb) { MySQL.prototype.discoverExportedForeignKeys = function (table, options, cb) {
var args = getArgs(table, options, cb); var args = getArgs(table, options, cb);
var owner = args.owner; var owner = args.owner;
if(!owner){
owner = inheritOwnerViaDataSource.call(this);
}
table = args.table; table = args.table;
options = args.options; options = args.options;
cb = args.cb; cb = args.cb;
@ -366,4 +378,11 @@ function mixinDiscovery(MySQL) {
return 'String'; return 'String';
} }
} }
function inheritOwnerViaDataSource(){
if(this.dataSource && this.dataSource.settings && this.dataSource.settings.database){
return this.dataSource.settings.database;
}
return undefined;
}
} }