Comparing version 2.16.9 to 2.16.10
@@ -239,5 +239,2 @@ /* UNIQORM | ||
.offset(this.offset); | ||
this._query.on('serialize', (ctx, type, o) =>{ | ||
//console.log(o); | ||
}); | ||
this._query.generate(); | ||
@@ -272,3 +269,3 @@ } | ||
targetNode[attrKey] = { | ||
column: finder._addColumn(tableAlias, field.fieldName) | ||
column: finder._addColumn(tableAlias, field) | ||
}; | ||
@@ -286,3 +283,3 @@ return; | ||
const f = model.getField(x); | ||
const col = finder._addColumn(tableAlias, f.fieldName); | ||
const col = finder._addColumn(tableAlias, f); | ||
col.attrName = x; | ||
@@ -310,3 +307,3 @@ attr.cols.push(col); | ||
const masterCol = finder._addColumn(tableAlias, | ||
finder.model.getField(masterKey).fieldName).colName; | ||
finder.model.getField(masterKey)).colName; | ||
@@ -331,4 +328,4 @@ // build where conditions | ||
fnd._masterCol = masterCol; | ||
fnd._detailCol = fnd._addColumn('t', | ||
fnd.model.getField(detailKey).fieldName).colName; | ||
fnd._detailCol = | ||
fnd._addColumn('t', fnd.model.getField(detailKey)).colName; | ||
finder._children = makeArray(finder._children); | ||
@@ -364,3 +361,3 @@ finder._children.push(fnd); | ||
const f = field.foreignModel.getField(v.subField); | ||
targetNode.column = fnd._addColumn(tableAlias, f.fieldName); | ||
targetNode.column = fnd._addColumn(tableAlias, f); | ||
return; | ||
@@ -371,3 +368,3 @@ } | ||
if (fld.fieldName) { | ||
targetNode.column = fnd._addColumn(tableAlias, fld.fieldName); | ||
targetNode.column = fnd._addColumn(tableAlias, fld); | ||
return; | ||
@@ -390,3 +387,3 @@ } | ||
targetNode[n] = { | ||
column: fnd._addColumn(tableAlias, f.fieldName) | ||
column: fnd._addColumn(tableAlias, f) | ||
}; | ||
@@ -440,4 +437,4 @@ } else { | ||
_addColumn(tableAlias, fieldName) { | ||
const s = (tableAlias + '.' + fieldName); | ||
_addColumn(tableAlias, field) { | ||
const s = (tableAlias + '.' + field.fieldName); | ||
let o = this._columns.get(s); | ||
@@ -448,3 +445,4 @@ if (o) | ||
colName: 'col' + (this._columns.size + 1), | ||
source: s | ||
source: s, | ||
field | ||
}; | ||
@@ -521,3 +519,6 @@ this._columns.set(s, o); | ||
if (attr.column) { | ||
target[n] = source[attr.column.colName]; | ||
const field = attr.column.field; | ||
target[n] = field instanceof DataField ? | ||
field.parseValue(source[attr.column.colName]) : | ||
source[attr.column.colName]; | ||
continue; | ||
@@ -524,0 +525,0 @@ } |
@@ -629,3 +629,3 @@ /* UNIQORM | ||
options.properties[attr].column); | ||
resultRow[attr] = row[colName]; | ||
resultRow[attr] = field.parseValue(row[colName]); | ||
} | ||
@@ -632,0 +632,0 @@ } |
{ | ||
"name": "uniqorm", | ||
"description": "Multi dialect and multi schema ORM framework for enterprise level NodeJS applications", | ||
"version": "2.16.9", | ||
"version": "2.16.10", | ||
"author": "Panates Ltd.", | ||
@@ -6,0 +6,0 @@ "contributors": [ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
100834
3303