@@ -590,11 +590,21 @@ function util_get_property_real_type(datatype::DataType, propname::Symbol)
590590 # Check if there is a type override for this property, if not we
591591 # use the property type
592592
593- if (isdefined (orm_module,:types_override )
594- && propname in collect (keys (orm_module. types_override)))
595- ptype = PostgresORM. get_orm (dummy_object). types_override[propname]
593+ if (
594+ isdefined (orm_module,:get_types_override )
595+ && propname in collect (keys (orm_module. get_types_override ()))
596+ )
597+ ptype = orm_module. get_types_override ()[propname]
598+
599+ elseif (
600+ isdefined (orm_module,:types_override )
601+ && propname in collect (keys (orm_module. types_override))
602+ )
603+ ptype = orm_module. types_override[propname]
596604 end
605+
597606 return ptype
607+
598608end
599609
600610
@@ -1059,21 +1069,6 @@ function util_get_onetomany_counterparts(o::IEntity)
10591069 return util_get_onetomany_counterparts (PostgresORM. get_orm (o))
10601070end
10611071
1062- function util_get_types_override (orm_module:: Module )
1063- if isdefined (orm_module,:get_types_override )
1064- return orm_module. get_types_override ()
1065- # This is support for the legacy way of declaring the id properties
1066- elseif isdefined (orm_module,:types_override )
1067- return orm_module. types_override
1068- else
1069- error (" orm_module[$orm_module ] is missing 'get_types_override'" )
1070- end
1071- end
1072-
1073- function util_get_types_override (o:: IEntity )
1074- return util_get_types_override (PostgresORM. get_orm (o))
1075- end
1076-
10771072function util_get_track_changes (orm_module:: Module )
10781073 if isdefined (orm_module,:get_track_changes )
10791074 return orm_module. get_track_changes ()
0 commit comments