iv-org-mirror/shard-crystal-db
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/shard-crystal-db.git synced 2024-08-15 00:53:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add full type qual up top to handle type unions

Browse source
This commit is contained in:
Jamie Gaskins 2024-03-10 15:56:37 -05:00
parent 2b6e4efbeb
commit 47a667c2d8
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/db/serializable.cr
View file

@ -109,7 +109,11 @@ module DB
{% unless ann && ann[:ignore] %} {% unless ann && ann[:ignore] %}
{% {%
properties[ivar.id] = { properties[ivar.id] = {
type: ivar.type, type: if ivar.type.union?
"Union(#{ivar.type.union_types.map { |t| "::#{t}".id }.join(" | ").id})".id
else
"::#{ivar.type}".id
end,
key: ((ann && ann[:key]) || ivar).id.stringify, key: ((ann && ann[:key]) || ivar).id.stringify,
default: ivar.default_value, default: ivar.default_value,
nilable: ivar.type.nilable?, nilable: ivar.type.nilable?,
@ -134,9 +138,9 @@ module DB
{% if value[:converter] %} {% if value[:converter] %}
{{value[:converter]}}.from_rs(rs) {{value[:converter]}}.from_rs(rs)
{% elsif value[:nilable] || value[:default] != nil %} {% elsif value[:nilable] || value[:default] != nil %}
rs.read(::Union(::{{value[:type]}} | Nil)) rs.read(::Union({{value[:type]}} | Nil))
{% else %} {% else %}
rs.read(::{{value[:type]}}) rs.read({{value[:type]}})
{% end %} {% end %}
rescue exc rescue exc
::raise ::DB::MappingException.new(exc.message, self.class.to_s, {{name.stringify}}, cause: exc) ::raise ::DB::MappingException.new(exc.message, self.class.to_s, {{name.stringify}}, cause: exc)
@ -166,7 +170,7 @@ module DB
{% elsif value[:default] != nil %} {% elsif value[:default] != nil %}
@{{key}} = %var{key}.is_a?(Nil) ? {{value[:default]}} : %var{key} @{{key}} = %var{key}.is_a?(Nil) ? {{value[:default]}} : %var{key}
{% else %} {% else %}
@{{key}} = %var{key}.as(::{{value[:type]}}) @{{key}} = %var{key}.as({{value[:type]}})
{% end %} {% end %}
{% end %} {% end %}
{% end %} {% end %}