Comparing version 1.0.11 to 1.0.13
30
mongo.js
@@ -90,3 +90,2 @@ const MongoDB = require('mongodb'); | ||
}); | ||
} | ||
@@ -98,7 +97,6 @@ | ||
var filter = WHERE(builder, true); | ||
client.db(client.$database).collection(opt.table).aggregate([ filter, cmd.value ]).toArray(function(err, response) { | ||
client.db(client.$database).collection(opt.table).aggregate([ filter, cmd.improved ]).toArray(function(err, response) { | ||
err && client.$opt.onerror && client.$opt.onerror(err, opt, builder); | ||
client.close(); | ||
builder.$callback(err, response[0].count); | ||
builder.$callback(err, response); | ||
}); | ||
@@ -238,2 +236,7 @@ } | ||
switch (key[0]) { | ||
case '&': | ||
key = key.substring(1); | ||
var gencode = val; | ||
gencode.key = key; | ||
break; | ||
case '-': | ||
@@ -250,2 +253,18 @@ case '+': | ||
if(gencode) { | ||
client.db(client.$database).collection(gencode.indexes).findOne({ code: gencode.precode }, function(err, response) { | ||
var indexcode = response.index + 1; | ||
indexcode = indexcode.toString(); | ||
while (indexcode.length < gencode.output) { | ||
indexcode = '0' + indexcode; | ||
} | ||
params[gencode.key] = gencode.precode + indexcode; | ||
client.db(client.$database).collection(gencode.indexes).updateOne({ code: gencode.precode }, { $inc: { index: +1 } }); | ||
}); | ||
} | ||
// builder.db.$debug && builder.db.$debug(); | ||
@@ -415,2 +434,5 @@ | ||
break; | ||
case 'pipeLines': | ||
pipeLines(client, cmd); | ||
break; | ||
case 'scalar': | ||
@@ -417,0 +439,0 @@ scalar(client, cmd); |
{ | ||
"name": "icorm", | ||
"version": "1.0.11", | ||
"version": "1.0.13", | ||
"description": "Database Management System", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
Sorry, the diff of this file is too big to display
216633
6880