Skip to content

Commit d0c2d20

Browse files
r-antoniettir-antonietti
committed
KNOWAGE-8950 - fix $velocityCount error
1 parent 07b83d6 commit d0c2d20

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎knowagemeta/src/main/resources/it/eng/knowage/meta/generator/templates/sbi_properties.vm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
${jpaTable.uniqueName}.visible = $jpaTable.getAttribute("structural.visible")
1010
${jpaTable.uniqueName}.type = $jpaTable.type
11-
${jpaTable.uniqueName}.position = $velocityCount
11+
${jpaTable.uniqueName}.position = $foreach.count
1212
${jpaTable.uniqueName}.sqlFilter = $jpaTable.getAttribute("structural.sqlFilter")
1313

1414
#foreach ($jpaColumn in $jpaTable.getColumns())
@@ -40,7 +40,7 @@ ${jpaColumn.uniqueName}.format = $jpaColumn.getAttribute("structural.format")
4040

4141
${jpaColumn.uniqueName}.customFunction = $jpaColumn.getAttribute("structural.customFunction")
4242
${jpaColumn.uniqueName}.excludedRoles = $jpaColumn.getAttribute("behavioural.notEnabledRoles")
43-
${jpaColumn.uniqueName}.position = $velocityCount
43+
${jpaColumn.uniqueName}.position = $foreach.count
4444
#end
4545

4646

@@ -68,7 +68,7 @@ ${jpaColumn.uniqueName}.attribute = $jpaColumn.getAttribute("structural.attribut
6868
${jpaColumn.uniqueName}.datatype = $jpaColumn.getAttribute("structural.datatype")
6969
${jpaColumn.uniqueName}.format = $jpaColumn.getAttribute("structural.format")
7070
${jpaColumn.uniqueName}.excludedRoles = $jpaColumn.getAttribute("behavioural.notEnabledRoles")
71-
${jpaColumn.uniqueName}.position = $velocityCount
71+
${jpaColumn.uniqueName}.position = $foreach.count
7272
#end
7373

7474

‎knowagemeta/src/main/resources/it/eng/knowage/meta/generator/templates/sbi_relationships.vm‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
"relationships": [
55
#foreach ($jpaTable in $jpaTables)
66
//==================================================================
7-
// $velocityCount $jpaTable.name
7+
// $foreach.count $jpaTable.name
88
//==================================================================
99

10-
#if($velocityCount > 1 && $jpaTable.getRelationships().size() > 0 && $isFirstItem == "false") , #end
10+
#if($foreach.count > 1 && $jpaTable.getRelationships().size() > 0 && $isFirstItem == "false") , #end
1111

1212
#foreach ($jpaRelationship in $jpaTable.getRelationships())
13-
#if($velocityCount > 1) , #end {
13+
#if($foreach.count > 1) , #end {
1414
#set( $isFirstItem = "false" )
1515
//---------------------------------------------------------------
16-
// $velocityCount ${jpaRelationship.description}
16+
// $foreach.count ${jpaRelationship.description}
1717
//---------------------------------------------------------------
1818
"name": '${jpaRelationship.propertyName}'
1919
, "bidirectional": $jpaRelationship.isBidirectional()
@@ -29,9 +29,9 @@
2929
, "sourceColumns": [
3030
#foreach ($sourceColumn in $jpaRelationship.sourceColumns)
3131
#if ($sourceColumn.jpaTable.hasFakePrimaryKey()|| ( $sourceColumn.jpaTable.hasCompositeKey() && $sourceColumn.isIdentifier()))
32-
'${sourceColumn.jpaTable.compositeKeyPropertyName}.${sourceColumn.propertyName}'#if($velocityHasNext) , #end
32+
'${sourceColumn.jpaTable.compositeKeyPropertyName}.${sourceColumn.propertyName}'#if($foreach.hasNext) , #end
3333
#else
34-
'${sourceColumn.propertyName}'#if($velocityHasNext) , #end
34+
'${sourceColumn.propertyName}'#if($foreach.hasNext) , #end
3535
#end
3636
#end
3737
]
@@ -45,9 +45,9 @@
4545
, "destinationColumns": [
4646
#foreach ($destinationColumn in $jpaRelationship.destinationColumns)
4747
#if ($destinationColumn.jpaTable.hasFakePrimaryKey()|| ( $destinationColumn.jpaTable.hasCompositeKey() && $destinationColumn.isIdentifier()))
48-
'${destinationColumn.jpaTable.compositeKeyPropertyName}.${destinationColumn.propertyName}'#if($velocityHasNext) , #end
48+
'${destinationColumn.jpaTable.compositeKeyPropertyName}.${destinationColumn.propertyName}'#if($foreach.hasNext) , #end
4949
#else
50-
'${destinationColumn.propertyName}'#if($velocityHasNext) , #end
50+
'${destinationColumn.propertyName}'#if($foreach.hasNext) , #end
5151
#end
5252
#end
5353

‎knowagemeta/src/main/resources/it/eng/knowage/meta/generator/templates/sbi_view.vm‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#foreach ($jpaColumn in $jpaView.getColumns($jpaTable))
2020
{
2121
name: '${jpaColumn.propertyName}'
22-
} #if($velocityHasNext) , #end
22+
} #if($foreach.hasNext) , #end
2323
#end
2424
]
25-
} #if($velocityHasNext) , #end
25+
} #if($foreach.hasNext) , #end
2626
#end
2727
]
2828
, joins: [
@@ -36,9 +36,9 @@
3636
#foreach ($sourceColumn in $joinRelationship.sourceColumns)
3737
## column name
3838
#if ($sourceColumn.jpaTable.hasFakePrimaryKey()|| ( $sourceColumn.jpaTable.hasCompositeKey() && $sourceColumn.isIdentifier()))
39-
'${sourceColumn.jpaTable.compositeKeyPropertyName}.${sourceColumn.propertyName}'#if($velocityHasNext) , #end
39+
'${sourceColumn.jpaTable.compositeKeyPropertyName}.${sourceColumn.propertyName}'#if($foreach.hasNext) , #end
4040
#else
41-
'${sourceColumn.propertyName}'#if($velocityHasNext) , #end
41+
'${sourceColumn.propertyName}'#if($foreach.hasNext) , #end
4242
#end
4343
## column name
4444
#end
@@ -51,14 +51,14 @@
5151
#foreach ($destinationColumn in $joinRelationship.destinationColumns)
5252
## column name
5353
#if ($destinationColumn.jpaTable.hasFakePrimaryKey()|| ( $destinationColumn.jpaTable.hasCompositeKey() && $destinationColumn.isIdentifier()))
54-
'${destinationColumn.jpaTable.compositeKeyPropertyName}.${destinationColumn.propertyName}'#if($velocityHasNext) , #end
54+
'${destinationColumn.jpaTable.compositeKeyPropertyName}.${destinationColumn.propertyName}'#if($foreach.hasNext) , #end
5555
#else
56-
'${destinationColumn.propertyName}'#if($velocityHasNext) , #end
56+
'${destinationColumn.propertyName}'#if($foreach.hasNext) , #end
5757
#end
5858
## column name
5959
#end
6060
]
61-
} #if($velocityHasNext) , #end
61+
} #if($foreach.hasNext) , #end
6262
#end
6363
]
6464
, outbound: [
@@ -77,14 +77,14 @@
7777
, sourceColumns: [
7878
#foreach ($sourceColumn in $relationship.sourceColumns)
7979
## column name
80-
'${sourceColumn}'#if($velocityHasNext) , #end
80+
'${sourceColumn}'#if($foreach.hasNext) , #end
8181
## column name
8282
#end
8383
]
8484
, destinationColumns: [
8585
#foreach ($destinationColumn in $relationship.destinationColumns)
8686
## column name
87-
'${destinationColumn}'#if($velocityHasNext) , #end
87+
'${destinationColumn}'#if($foreach.hasNext) , #end
8888
## column name
8989
#end
9090
]
@@ -109,22 +109,22 @@
109109
, sourceColumns: [
110110
#foreach ($sourceColumn in $relationship.sourceColumns)
111111
## column name
112-
'${sourceColumn}'#if($velocityHasNext) , #end
112+
'${sourceColumn}'#if($foreach.hasNext) , #end
113113
## column name
114114
#end
115115
]
116116
, destinationColumns: [
117117
#foreach ($destinationColumn in $relationship.destinationColumns)
118118
## column name
119-
'${destinationColumn}'#if($velocityHasNext) , #end
119+
'${destinationColumn}'#if($foreach.hasNext) , #end
120120
## column name
121121
#end
122122
]
123123
}
124124
#end
125125
#end
126126
]
127-
}#if($velocityHasNext) , #end
127+
}#if($foreach.hasNext) , #end
128128
###################################################################################
129129
##### VIEWS
130130
###################################################################################

0 commit comments

Comments
 (0)