Permalink
Browse files

Fixed compilation problems with ghc 6.10.1 Added handling for hdbc co…

…nnection.
  • Loading branch information...
1 parent 6d9277e commit 85d978b26290a50678fb8fa195fa9cd2f0eb67f3 Diego Echeverri committed Dec 16, 2008
View
@@ -14,6 +14,7 @@ import System.Log.Logger
-- Your favorite HDBC driver
import Database.HDBC.PostgreSQL
+import Database.HDBC
----------------------------------------------------------------
-- Environment settings
@@ -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
View
@@ -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(..))
@@ -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
@@ -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(..))
@@ -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
View
@@ -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(..))
@@ -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
View
@@ -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(..))
View
@@ -33,7 +33,7 @@ Executable turbinado
UndecidableInstances,
PatternGuards,
MultiParamTypeClasses,
- PatternSignatures,
+ ScopedTypeVariables
DeriveDataTypeable

0 comments on commit 85d978b

Please sign in to comment.