diff options
Diffstat (limited to 'org.eclipse.osbp.xtext.datainterchange/src/org/eclipse/osbp/xtext/datainterchange/DataDSL.xtext')
| -rw-r--r-- | org.eclipse.osbp.xtext.datainterchange/src/org/eclipse/osbp/xtext/datainterchange/DataDSL.xtext | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/org.eclipse.osbp.xtext.datainterchange/src/org/eclipse/osbp/xtext/datainterchange/DataDSL.xtext b/org.eclipse.osbp.xtext.datainterchange/src/org/eclipse/osbp/xtext/datainterchange/DataDSL.xtext index 9b55c17..ce20d6f 100644 --- a/org.eclipse.osbp.xtext.datainterchange/src/org/eclipse/osbp/xtext/datainterchange/DataDSL.xtext +++ b/org.eclipse.osbp.xtext.datainterchange/src/org/eclipse/osbp/xtext/datainterchange/DataDSL.xtext @@ -132,15 +132,15 @@ DataInterchangeExpose: DataInterchangeExportFilter: {DataInterchangeExportFilter} ('where' '{' (attrFilter=AttributeFilter)? (refFilter=ReferenceFilter)? '}' )? - ('join' join=DataInterchangeJoin)? +// ('join' join=DataInterchangeJoin)? ('hide' hiddenproperties+=DataInterchangeExportHide*)?; DataInterchangeJoin: - {DataInterchangeJoin} beanAttr1=DataInterchangeJoinAttr 'with' joinEntity=[entity::LEntity|LFQN] 'on' beanAttr2=DataInterchangeJoinAttr; + {DataInterchangeJoin} beanAttr1=DataInterchangeJoinAttr 'with' joinRef=[entity::LEntityReference] ('on' beanAttr2=DataInterchangeJoinAttr)?; DataInterchangeJoinAttr: {DataInterchangeJoinAttr} - (refEntity=[entity::LEntityReference])? refProperty=[entity::LEntityAttribute]; + (ref=[entity::LEntityReference])? refProperty=[entity::LEntityAttribute]; DataInterchangeFilter: {DataInterchangeFilter} @@ -155,12 +155,11 @@ ReferenceFilter: ReferenceFilterWithAttr: {ReferenceFilterWithAttr} - 'referenceAttribute' refEntity=[entity::LEntityReference] '.' refProperty=[entity::LEntityAttribute] operator=Operator (value=STRING)? (operator2=Junction subCondition=ReferenceFilter)? ; + 'referenceAttribute' ref=[entity::LEntityReference] '.' refProperty=[entity::LEntityAttribute] operator=Operator (value=STRING)? (operator2=Junction subCondition=ReferenceFilter)? ; ReferenceFilterWithOutAttr: {ReferenceFilterWithOutAttr} - 'reference' refEntity=[entity::LEntityReference] operator=Operator (value=STRING)? (operator2=Junction subCondition=ReferenceFilter)? ; - + 'reference' ref=[entity::LEntityReference] operator=Operator (value=STRING)? (operator2=Junction subCondition=ReferenceFilter)? ; DataInterchangeLookupFilterCondition: refProperty=[entity::LEntityFeature] operator=Operator @@ -249,11 +248,11 @@ enum Operator: lessthan = 'lessThan' | lessthanorequalto = 'lessThanOrEqualTo' | isnull = 'isNull' | - isnotnull = 'isNotNull' | - isin = 'isIn' | - isnotin = 'isNotIn' | - islike = 'isLike' - ; + isnotnull = 'isNotNull'; +// isin = 'isIn' | +// isnotin = 'isNotIn' | +// islike = 'isLike' +// ; enum Junction: and = 'and'| |