Commit 89ce1f4
revert: backport DataElement.optionSet Hibernate mapping fix to 2.43 (#24394)
This reverts commit 8f290c3.
Restores the XML-based DataElement Hibernate mapping (DataElement.hbm.xml)
and reverts the annotation-based mapping migration along with the associated
analytics query-planner and store changes.
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>1 parent 4aca8e7 commit 89ce1f4
37 files changed
Lines changed: 209 additions & 616 deletions
File tree
- dhis-2
- dhis-api/src/main/java/org/hisp/dhis
- common
- dataelement
- dataset
- datavalue
- eventchart
- eventreport
- eventvisualization
- programrule
- program
- notification/template
- sms/command/code
- trackedentity
- dhis-services
- dhis-service-administration/src/main/java/org/hisp/dhis/merge
- dhis-service-analytics/src
- main/java/org/hisp/dhis/analytics
- data
- test/java/org/hisp/dhis/analytics
- data
- util
- dhis-service-core/src/main
- java/org/hisp/dhis
- dataelement/hibernate
- dimension
- resources/org/hisp/dhis/dataelement/hibernate
- dhis-test-e2e/src/test/java/org/hisp/dhis/analytics/event/aggregate
- dhis-test-integration/src/test/java/org/hisp/dhis/analytics/data
- dhis-web-api/src/test/java/org/hisp/dhis/analytics/dimension
- mappers
Lines changed: 2 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | 44 | | |
46 | 45 | | |
47 | | - | |
48 | 46 | | |
49 | 47 | | |
50 | 48 | | |
| |||
62 | 60 | | |
63 | 61 | | |
64 | 62 | | |
65 | | - | |
| 63 | + | |
66 | 64 | | |
67 | 65 | | |
68 | 66 | | |
69 | | - | |
70 | 67 | | |
71 | 68 | | |
72 | 69 | | |
| |||
100 | 97 | | |
101 | 98 | | |
102 | 99 | | |
103 | | - | |
| 100 | + | |
104 | 101 | | |
105 | 102 | | |
106 | 103 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
337 | 337 | | |
338 | 338 | | |
339 | 339 | | |
340 | | - | |
| 340 | + | |
341 | 341 | | |
342 | 342 | | |
343 | 343 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
| 74 | + | |
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
| |||
0 commit comments