Merge pull request 'fix(sqlConnector): handled malformed json parse' (!1417) from 4862-sqlconnector_all into master
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1417 Reviewed-by: Juan Ferrer <juan@verdnatura.es>
This commit is contained in:
commit
1258dd54b6
|
@ -1,8 +1,7 @@
|
||||||
const mysql = require('mysql');
|
const mysql = require('mysql');
|
||||||
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
|
||||||
const MySQL = require('loopback-connector-mysql').MySQL;
|
const MySQL = require('loopback-connector-mysql').MySQL;
|
||||||
const EnumFactory = require('loopback-connector-mysql').EnumFactory;
|
const EnumFactory = require('loopback-connector-mysql').EnumFactory;
|
||||||
const Transaction = require('loopback-connector').Transaction;
|
const { Transaction, SQLConnector, ParameterizedSQL } = require('loopback-connector');
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
|
||||||
const limitSet = new Set([
|
const limitSet = new Set([
|
||||||
|
@ -645,3 +644,31 @@ function generateOptions(settings) {
|
||||||
}
|
}
|
||||||
return options;
|
return options;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
SQLConnector.prototype.all = function find(model, filter, options, cb) {
|
||||||
|
const self = this;
|
||||||
|
// Order by id if no order is specified
|
||||||
|
filter = filter || {};
|
||||||
|
const stmt = this.buildSelect(model, filter, options);
|
||||||
|
this.execute(stmt.sql, stmt.params, options, function (err, data) {
|
||||||
|
if (err) {
|
||||||
|
return cb(err, []);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const objs = data.map(function (obj) {
|
||||||
|
return self.fromRow(model, obj);
|
||||||
|
});
|
||||||
|
if (filter && filter.include) {
|
||||||
|
self.getModelDefinition(model).model.include(
|
||||||
|
objs, filter.include, options, cb,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
cb(null, objs);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
cb(error, [])
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
Loading…
Reference in New Issue