diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs index 6d79df51..4fc9d241 100644 --- a/yesod/Scaffolding/Scaffolder.hs +++ b/yesod/Scaffolding/Scaffolder.hs @@ -66,8 +66,8 @@ scaffold = do backendC <- prompt $ flip elem $ map (return . toLower . head . show) backends let (backend, importGenericDB, dbMonad, importPersist, mkPersistSettings) = case backendC of - "s" -> (Sqlite, "GenericSql", "SqlPersist", "Sqlite", "sqlMkSettings") - "p" -> (Postgresql, "GenericSql", "SqlPersist", "Postgresql", "sqlMkSettings") + "s" -> (Sqlite, "GenericSql", "SqlPersist", "Sqlite", "sqlSettings") + "p" -> (Postgresql, "GenericSql", "SqlPersist", "Postgresql", "sqlSettings") "m" -> (MongoDB, "MongoDB", "Action", "MongoDB", "MkPersistSettings { mpsBackend = ConT ''Action }") "t" -> (Tiny, "","","",undefined) _ -> error $ "Invalid backend: " ++ backendC diff --git a/yesod/scaffold/Model.hs.cg b/yesod/scaffold/Model.hs.cg index 3b205d5e..ed11b9d8 100644 --- a/yesod/scaffold/Model.hs.cg +++ b/yesod/scaffold/Model.hs.cg @@ -11,5 +11,5 @@ import Database.Persist.Quasi -- at: -- http://www.yesodweb.com/book/persistent/ share [mkPersist ~mkPersistSettings~, mkMigrate "migrateAll"] - $(persistFile upperCaseSettings "config/models") + $(persistFileWith lowerCaseSettings "config/models")