haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove -text dep, make Postgresql work...

Browse Source
This commit is contained in:
patrick brisbin 2011-09-21 17:29:55 -04:00
parent df52b8a340
commit cfb11cca89
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yesod-core/Yesod/Config.hs
View File

@ -30,8 +30,7 @@ data AppConfig e = AppConfig
-- | Information required to connect to a postgres database -- | Information required to connect to a postgres database
data PostgresConf = PostgresConf data PostgresConf = PostgresConf
{ pgConnStr :: String { pgConnStr :: Text
, pgDatabase :: String
, pgPoolSize :: Int , pgPoolSize :: Int
} }
@ -126,11 +125,11 @@ loadPostgresql env = withYamlEnvironment "config/postgresql.yml" env $ \e -> do
-- TODO: default host/port? -- TODO: default host/port?
connparts <- forM ["user", "password", "host", "port"] $ \k -> do connparts <- forM ["user", "password", "host", "port"] $ \k -> do
v <- lookupScalar k e v <- lookupScalar k e
return $ k ++ "=" ++ v return $ k ++ "=" ++ v ++ " "
conn <- return $ concat connparts conn <- return $ concat connparts
return $ PostgresConf conn db pool return $ PostgresConf (T.pack $ conn ++ " dbname=" ++ db) pool
-- | Load a @'SqliteConf'@ from @config\/sqlite.yml@. -- | Load a @'SqliteConf'@ from @config\/sqlite.yml@.
-- --

1
yesod-core/yesod-core.cabal
View File

@ -38,7 +38,6 @@ library
, shakespeare >= 0.10 && < 0.11 , shakespeare >= 0.10 && < 0.11
, shakespeare-js >= 0.10 && < 0.11 , shakespeare-js >= 0.10 && < 0.11
, shakespeare-css >= 0.10 && < 0.11 , shakespeare-css >= 0.10 && < 0.11
, shakespeare-text >= 0.10 && < 0.11
, blaze-builder >= 0.2.1 && < 0.4 , blaze-builder >= 0.2.1 && < 0.4
, transformers >= 0.2 && < 0.3 , transformers >= 0.2 && < 0.3
, clientsession >= 0.7.2 && < 0.8 , clientsession >= 0.7.2 && < 0.8