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 branch 'master' of github.com:1602/jugglingdb

This commit is contained in:
Anatoliy Chakkaev 2012-02-20 22:33:28 +04:00
parent e8c6f68353 96459bfdcd
commit 11b4436fd1
2 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/adapters/mysql.js
View File

@ -104,7 +104,13 @@ 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;
if (prop.type.name === 'Date') { if (prop.type.name === 'Date') {
@ -205,22 +211,31 @@ MySQL.prototype.all = function all(model, filter, callback) {
var sqlCond = keyEscaped; var sqlCond = keyEscaped;
switch (condType) { switch (condType) {
case 'gt': case 'gt':
sqlCond += ' > '; sqlCond += ' > ';
break; break;
case 'gte': case 'gte':
sqlCond += ' >= '; sqlCond += ' >= ';
break; break;
case 'lt': case 'lt':
sqlCond += ' < '; sqlCond += ' < ';
break; break;
case 'lte': case 'lte':
sqlCond += ' <= '; sqlCond += ' <= ';
break; break;
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);
@ -430,17 +445,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;
} }

6
lib/adapters/redis.js
View File

@ -243,8 +243,10 @@ BridgeToRedis.prototype.all = function all(model, filter, callback) {
orders = [filter.order]; orders = [filter.order];
} }
orders.forEach(function (key) { orders.forEach(function (key) {
if (props[key].type.name !== 'Number' && props[key].type.name !== 'Date') { if (key !== 'id') {
allNumeric = false; if (props[key].type.name !== 'Number' && props[key].type.name !== 'Date') {
allNumeric = false;
}
} }
sortCmd.push("BY", model + ":*->" + key); sortCmd.push("BY", model + ":*->" + key);
}); });