Tweaks to make the package compatible with JSON3 struct mapping (#24)

Author: DilumAluthge

src/Generate/generate-types.jl

@@ -7,7 +7,8 @@ Generate the code for OMOPCommonDataModel from the DDL.
                             output_file = "autogenerated.jl",
                             string_casing::F = pascalcase,
                             export_structs::Bool = true,
-                            make_all_fields_optional::Bool = false) where F
+                            make_all_fields_optional::Bool = false,
+                            struct_keyword = "struct") where F
     input_file_abspath = abspath(input_file)
     output_file_abspath = abspath(output_file)
     @info("Reading from input file \"$(input_file_abspath)\"")
@@ -16,7 +17,8 @@ Generate the code for OMOPCommonDataModel from the DDL.
     contents = _generate(input_file_contents;
                          export_structs = export_structs,
                          make_all_fields_optional = make_all_fields_optional,
-                         string_casing = string_casing)
+                         string_casing = string_casing,
+                         struct_keyword = struct_keyword)
     mkpath(dirname(output_file_abspath))
     rm(output_file_abspath; force = true, recursive = true)
     open(output_file_abspath, "w") do io
@@ -30,7 +32,8 @@ end
 @inline function _generate(input_file_contents::AbstractString;
                            string_casing::F,
                            export_structs::Bool,
-                           make_all_fields_optional)::String where F
+                           make_all_fields_optional,
+                           struct_keyword)::String where F
     pattern = r"CREATE TABLE ([\w_]*?)[ ]?[\n]?\(([\s\S]*?\n)\s?\s?\s?\s?\s?\s?\)\n;"
     all_match_positions = findall(pattern, input_file_contents)
     all_match_strings = String[input_file_contents[position] for position in all_match_positions]
@@ -39,7 +42,8 @@ end
                               str;
                               export_structs = export_structs,
                               make_all_fields_optional = make_all_fields_optional,
-                              string_casing = string_casing) for str in all_match_strings
+                              string_casing = string_casing,
+                              struct_keyword = struct_keyword) for str in all_match_strings
     ]
     num_generated_types = length(all_type_lines)
     output_lines = vcat(
@@ -65,7 +69,8 @@ end
                                        str;
                                        string_casing::F,
                                        export_structs::Bool,
-                                       make_all_fields_optional::Bool)::String where F
+                                       make_all_fields_optional::Bool,
+                                       struct_keyword)::String where F
     m = match(pattern, str)
     cdmname = m[1]
     _cdmname = strip(cdmname)
@@ -97,7 +102,7 @@ end
         String["\$(DocStringExtensions.TYPEDEF)"],
         String["\$(DocStringExtensions.TYPEDFIELDS)"],
         String["\"\"\""],
-        String["Base.@kwdef struct $(structname) <: CDMType"],
+        String["Base.@kwdef $(struct_keyword) $(structname) <: CDMType"],
         fields,
         String["end"],
     )
@@ -146,15 +151,14 @@ end
                                           null_or_notnull;
                                           make_all_fields_optional::Bool)::String
     _null_or_notnull = strip(null_or_notnull)
-    required_case = "$(partial_fieldtype)"
-    optional_case = "Union{$(partial_fieldtype), Missing} = missing"
-    if make_all_fields_optional
-        return optional_case
-    end
     if _null_or_notnull == "NULL"
-        return optional_case
+        return "Union{$(partial_fieldtype), Missing} = missing # optional"
     elseif _null_or_notnull == "NOT NULL"
-        return required_case
+        if make_all_fields_optional
+            return "Union{$(partial_fieldtype), Missing} = missing # required"
+        else
+            return "$(partial_fieldtype) # required"
+        end
     end
     throw(ArgumentError("Invalid value for `null_or_notnull`: $(null_or_notnull)"))
 end