From 99f376a8258115dbc2d49c237d79a467488ff0c1 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 12 Jan 2014 00:01:54 -0500 Subject: [PATCH] USe lowerCaseSuffixNamingStyle as our base in TSN.Codegen. --- src/TSN/Codegen.hs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/TSN/Codegen.hs b/src/TSN/Codegen.hs index 38aede4..467f86b 100644 --- a/src/TSN/Codegen.hs +++ b/src/TSN/Codegen.hs @@ -9,10 +9,14 @@ import Data.List.Utils ( join, split ) import Database.Groundhog.TH ( CodegenConfig ( namingStyle ), NamingStyle ( mkDbConstrName, mkDbFieldName, mkExprFieldName ), - defaultCodegenConfig ) + defaultCodegenConfig, + lowerCaseSuffixNamingStyle ) -default_ns :: NamingStyle -default_ns = namingStyle defaultCodegenConfig +-- | The lowercase naming style for database entities, provided by +-- Groundhog. Makes a better starting point than the default. +-- +lowercase_ns :: NamingStyle +lowercase_ns = lowerCaseSuffixNamingStyle -- | A database field name creator. It takes the field name (from a -- record type) and drops the first component determined by @@ -22,10 +26,6 @@ tsn_db_field_namer :: String -> String -> Int -> String -> Int -> String tsn_db_field_namer _ _ _ fieldname _ = (join "_") . tail . (split "_") $ fieldname -tsn_db_constr_namer :: String -> String -> Int -> String -tsn_db_constr_namer _ constrname _ = - map toLower constrname - tsn_expr_field_namer :: String -> String -> Int -> String -> Int -> String tsn_expr_field_namer _ _ _ fieldname _ = (join "_") . (map capitalize) . (split "_") $ fieldname @@ -34,9 +34,8 @@ tsn_expr_field_namer _ _ _ fieldname _ = capitalize (c:cs) = (toUpper c : cs) tsn_naming_style :: NamingStyle -tsn_naming_style = default_ns { mkDbConstrName = tsn_db_constr_namer, - mkDbFieldName = tsn_db_field_namer, - mkExprFieldName = tsn_expr_field_namer } +tsn_naming_style = lowercase_ns { mkDbFieldName = tsn_db_field_namer, + mkExprFieldName = tsn_expr_field_namer } tsn_codegen_config :: CodegenConfig tsn_codegen_config = -- 2.44.2