@balena/odata-to-abstract-sql
Advanced tools
Comparing version 5.2.0-named-keys-2ad74da6c0cbff45907e54fc25bccb0d954c166f to 5.2.0-named-keys-75ed00ddaef0f032fa1ffe5003d1858e1540df26
@@ -9,4 +9,12 @@ # Change Log | ||
* Add support for specifying named keys [Pagan Gazzard] | ||
<details> | ||
<summary> Add support for specifying named keys [Pagan Gazzard] </summary> | ||
> ### odata-parser-2.1.0 - 2020-07-10 | ||
> | ||
> * Add support for specifying named keys [Pagan Gazzard] | ||
> | ||
</details> | ||
## 5.1.1 - 2020-07-10 | ||
@@ -13,0 +21,0 @@ |
@@ -36,3 +36,3 @@ import * as _ from 'lodash'; | ||
merge(otherQuery: Query): void; | ||
fromResource(odataToAbstractSql: OData2AbstractSQL, resource: Resource, args?: { | ||
fromResource(odataToAbstractSql: OData2AbstractSQL, resource: AliasedResource, args?: { | ||
extraBindVars: ODataBinds; | ||
@@ -62,3 +62,3 @@ bindVarsLength: number; | ||
PathSegment(method: string, bodyKeys: string[], path: ODataQuery): Query; | ||
PathKey(method: string, path: ODataQuery, resource: Resource, bodyKeys: string[]): BooleanTypeNodes | void; | ||
PathKey(method: string, path: ODataQuery, resource: AliasedResource, bodyKeys: string[]): BooleanTypeNodes | void; | ||
Bind(bind: BindReference, optional: true): AbstractSqlType | undefined; | ||
@@ -65,0 +65,0 @@ Bind(bind: BindReference, optional?: false): AbstractSqlType; |
{ | ||
"name": "@balena/odata-to-abstract-sql", | ||
"version": "5.2.0-named-keys-2ad74da6c0cbff45907e54fc25bccb0d954c166f", | ||
"version": "5.2.0-named-keys-75ed00ddaef0f032fa1ffe5003d1858e1540df26", | ||
"description": "A consumer of the OData parser, written in OMeta", | ||
@@ -21,3 +21,3 @@ "main": "out/odata-to-abstract-sql.js", | ||
"@balena/abstract-sql-compiler": "^7.0.2", | ||
"@balena/odata-parser": "^2.1.0-named-keys-926615afa77b3c67db8429a03ac5437838fbf939", | ||
"@balena/odata-parser": "^2.1.0", | ||
"@types/lodash": "^4.14.157", | ||
@@ -24,0 +24,0 @@ "@types/memoizee": "^0.4.4", |
@@ -134,3 +134,3 @@ import * as _ from 'lodash'; | ||
odataToAbstractSql: OData2AbstractSQL, | ||
resource: Resource, | ||
resource: AliasedResource, | ||
args: { | ||
@@ -151,6 +151,6 @@ extraBindVars: ODataBinds; | ||
definition.abstractSqlQuery, | ||
resource.tableAlias!, | ||
resource.tableAlias, | ||
]); | ||
} else if (resource.name !== resource.tableAlias) { | ||
this.from.push(['Alias', ['Table', resource.name], resource.tableAlias!]); | ||
this.from.push(['Alias', ['Table', resource.name], resource.tableAlias]); | ||
} else { | ||
@@ -392,3 +392,3 @@ this.from.push(['Table', resource.name]); | ||
'ReferencedField', | ||
resource.tableAlias!, | ||
resource.tableAlias, | ||
resource.idField, | ||
@@ -475,3 +475,3 @@ ]; | ||
'ReferencedField', | ||
resource.tableAlias!, | ||
resource.tableAlias, | ||
bindVar[0], | ||
@@ -601,3 +601,3 @@ ], | ||
path: ODataQuery, | ||
resource: Resource, | ||
resource: AliasedResource, | ||
bodyKeys: string[], | ||
@@ -632,3 +632,3 @@ ): BooleanTypeNodes | void { | ||
'ReferencedField', | ||
resource.tableAlias!, | ||
resource.tableAlias, | ||
resource.idField, | ||
@@ -671,6 +671,3 @@ ]; | ||
const bind = this.Bind(key[fieldName]); | ||
const referencedField: ReferencedFieldNode = this.ReferencedField( | ||
resource, | ||
fieldName, | ||
); | ||
const referencedField = this.ReferencedField(resource, fieldName); | ||
return [comparison.eq, referencedField, bind]; | ||
@@ -1322,3 +1319,3 @@ }, | ||
nestedExpandQuery.compile('SelectQuery') as SelectQueryNode, | ||
expandResource.tableAlias!, | ||
expandResource.tableAlias, | ||
]); | ||
@@ -1325,0 +1322,0 @@ query.select.push([ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
380916
2935
Updated@balena/odata-parser@^2.1.0