Skip to content

Commit

Permalink
Fixed compilation problems with ghc 6.10.1 Added handling for hdbc co…
Browse files Browse the repository at this point in the history
…nnection.
  • Loading branch information
Diego Echeverri authored and Diego Echeverri committed Dec 16, 2008
1 parent 6d9277e commit 85d978b
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 10 deletions.
4 changes: 3 additions & 1 deletion Config/App.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import System.Log.Logger

-- Your favorite HDBC driver
import Database.HDBC.PostgreSQL
import Database.HDBC

----------------------------------------------------------------
-- Environment settings
Expand All @@ -29,7 +30,8 @@ newAppEnvironment = AppEnvironment
----------------------------------------------------------------
databaseConnection :: Maybe (IO Connection)
-- databaseConnection = Nothing
databaseConnection = Just $ connectPostgreSQL "host=localhost dbname=turbinado user=turbinado password=turbinado"
databaseConnection = Just $ handleSqlError
$ connectPostgreSQL "host=localhost dbname=turbinado user=postgres password=12457890"

----------------------------------------------------------------
-- RequestHandler Filter List additions
Expand Down
2 changes: 1 addition & 1 deletion Turbinado/Controller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module Turbinado.Controller (
module Turbinado.Environment.ViewData
) where

import Control.Exception (catchDyn)
import Control.OldException (catchDyn)
import Control.Monad
import Control.Monad.State
import Control.Monad.Trans (MonadIO(..))
Expand Down
2 changes: 1 addition & 1 deletion Turbinado/Controller/Exception.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module Turbinado.Controller.Exception (
) where

import Data.Typeable
import Control.Exception (throwDyn)
import Control.OldException (throwDyn)

data Exception
= ParameterLookupFailed String -- ^ User tried to do an irrefutable parameter lookup
Expand Down
2 changes: 1 addition & 1 deletion Turbinado/Controller/Monad.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module Turbinado.Controller.Monad (
doIO, catch
) where

import Control.Exception (catchDyn)
import Control.OldException (catchDyn)

import Control.Monad.State
import Control.Monad.Trans (MonadIO(..))
Expand Down
4 changes: 2 additions & 2 deletions Turbinado/Server/Exception.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ module Turbinado.Server.Exception (
, catchTurbinado
, throwTurbinado
, throwTurbinadoTo
, module Control.Exception
, module Control.OldException
) where

import Data.Typeable
import Control.Exception
import Control.OldException
import Control.Concurrent(ThreadId)

catchTurbinado :: IO a -> (TurbinadoException -> IO a) -> IO a
Expand Down
2 changes: 1 addition & 1 deletion Turbinado/View.hs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module Turbinado.View (
module Turbinado.Environment.ViewData
) where

import Control.Exception (catchDyn)
import Control.OldException (catchDyn)
import Control.Monad
import Control.Monad.State
import Control.Monad.Trans (MonadIO(..))
Expand Down
2 changes: 1 addition & 1 deletion Turbinado/View/Exception.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module Turbinado.View.Exception (
) where

import Data.Typeable
import Control.Exception (throwDyn)
import Control.OldException (throwDyn)

data Exception
= ParameterLookupFailed String -- ^ User tried to do an irrefutable parameter lookup
Expand Down
2 changes: 1 addition & 1 deletion Turbinado/View/Monad.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Turbinado.View.Monad (
doIO, catch
) where

import Control.Exception (catchDyn)
import Control.OldException (catchDyn)

import Control.Monad.State
import Control.Monad.Trans (MonadIO(..))
Expand Down
2 changes: 1 addition & 1 deletion turbinado.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Executable turbinado
UndecidableInstances,
PatternGuards,
MultiParamTypeClasses,
PatternSignatures,
ScopedTypeVariables
DeriveDataTypeable


0 comments on commit 85d978b

Please sign in to comment.