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

Merge pull request #24 from Geeknux/master 

Add some new features to advance query in Mysql
This commit is contained in:
1602 2012-02-20 10:32:09 -08:00
parent bc814b435c 7569a923c8
commit 96459bfdcd
1 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/adapters/mysql.js
View File

@ -104,6 +104,12 @@ MySQL.prototype.toDatabase = function (prop, val) {
return this.toDatabase(prop, val[0]) + return this.toDatabase(prop, val[0]) +
' AND ' + ' AND ' +
this.toDatabase(prop, val[1]); this.toDatabase(prop, val[1]);
} else if (operator == 'inq' || operator == 'nin') {
if (!(val.propertyIsEnumerable('length')) && typeof val === 'object' && typeof val.length === 'number') { //if value is array
return val.join(',');
} else {
return val;
}
} }
} }
if (prop.type.name === 'Number') return val; if (prop.type.name === 'Number') return val;
@ -219,8 +225,17 @@ MySQL.prototype.all = function all(model, filter, callback) {
case 'between': case 'between':
sqlCond += ' BETWEEN '; sqlCond += ' BETWEEN ';
break; break;
case 'inq':
sqlCond += ' IN ';
break;
case 'nin':
sqlCond += ' NOT IN ';
break;
case 'neq':
sqlCond + ' != ';
break;
} }
sqlCond += val; sqlCond += (condType == 'inq' || condType == 'nin') ? '(' + val + ')' : val;
cs.push(sqlCond); cs.push(sqlCond);
} else { } else {
cs.push(keyEscaped + ' = ' + val); cs.push(keyEscaped + ' = ' + val);
@ -398,17 +413,24 @@ MySQL.prototype.propertySettingsSQL = function (model, prop) {
}; };
function datatype(p) { function datatype(p) {
var dt = '';
switch (p.type.name) { switch (p.type.name) {
case 'String': case 'String':
return 'VARCHAR(' + (p.limit || 255) + ')'; dt = 'VARCHAR(' + (p.limit || 255) + ')';
break;
case 'Text': case 'Text':
return 'TEXT'; dt = 'TEXT';
break;
case 'Number': case 'Number':
return 'INT(11)'; dt = 'INT(' + (p.limit || 11) + ')';
break;
case 'Date': case 'Date':
return 'DATETIME'; dt = 'DATETIME';
break;
case 'Boolean': case 'Boolean':
return 'TINYINT(1)'; dt = 'TINYINT(1)';
break;
} }
dt += (typeof p.default !== 'undefined') ? ' DEFAULT ' + p.default.toString() : '';
return dt;
} }