@@ -40,13 +40,25 @@ module PostgresORM
4040 setpropertiesvalues!, remove_spaces_and_split, diff_dict, string2enum,
4141 int2enum, enum2int, dictstringkeys2symbol, dictnothingvalues2missing,
4242 getproperties_asdict, string2zoneddatetime
43- include (" ./util/utils.jl" )
43+
44+ # Implementations of 'pluralize' are kept in one module per language
45+ module Pluralize
46+ module ENG
47+ include (" ./PostgresORMUtil/Pluralize/ENG.jl" )
48+ end
49+ module FRA
50+ include (" ./PostgresORMUtil/Pluralize/FRA.jl" )
51+ end
52+ end
53+
54+ include (" ./PostgresORMUtil/pluralize.jl" )
55+ include (" ./PostgresORMUtil/utils.jl" )
4456
4557 end # module PostgresORMUtil
4658
4759 # Provides functions to get information about the database structures
4860 module SchemaInfo
49- include (" ./schema-info /SchemaInfo-def.jl" ) # This is only the definition of the
61+ include (" ./SchemaInfo /SchemaInfo-def.jl" ) # This is only the definition of the
5062 # module. See below for the actual
5163 # implementation.
5264 end # module SchemaInfo
@@ -86,12 +98,12 @@ module PostgresORM
8698 using .. PostgresORMUtil, .. SchemaInfo
8799 # using .ModificationORM # no need (because ModificationORM is a children module ?)
88100 using Tables, DataFrames, Query, LibPQ, Dates, UUIDs, TickTock
89- include (" ./tool /Tool.jl" )
101+ include (" ./Tool /Tool.jl" )
90102
91103 end # module Tool
92104
93105 # Implementation of the SchemaInfo module
94- include (" ./schema-info /SchemaInfo-imp.jl" )
106+ include (" ./SchemaInfo /SchemaInfo-imp.jl" )
95107
96108
97109 include (" ./exposed-functions-from-submodules.jl" )
0 commit comments