[Pkg-haskell-commits] [SCM] Haskell Database Connectivity branch, upstream, updated. debian/2.1.0-2-18-ge5b06e3

[John Goerzen]

The following commit has been merged in the upstream branch:
commit b28a67382bd4a095844ce5041fc225058a5239fe
Author: Simon Hengel <simon.hengel at wiktory.org>
Date:   Sun Apr 4 19:36:04 2010 +0200

    - workaround for #206 2/2] Workaround for bug #206
    
    As the semantic of System.Locale.iso8601DateFormat has changed with
    old-locale-1.0.0.2 in a non-compatible way, we now define our own
    (compatible) version of it.

diff --git a/Database/HDBC/Locale.hs b/Database/HDBC/Locale.hs
new file mode 100644
index 0000000..e62b1c1
--- /dev/null
+++ b/Database/HDBC/Locale.hs
@@ -0,0 +1,17 @@
+module Database.HDBC.Locale
+    (
+     defaultTimeLocale,
+     iso8601DateFormat
+    )
+
+where
+import System.Locale (defaultTimeLocale)
+
+-- | As the semantic of System.Locale.iso8601DateFormat has changed with
+--   old-locale-1.0.0.2 in a non-compatible way, we now define our own
+--   (compatible) version of it.
+iso8601DateFormat :: Maybe String -> String
+iso8601DateFormat mTimeFmt =
+    "%Y-%m-%d" ++ case mTimeFmt of
+             Nothing  -> ""
+             Just fmt -> ' ' : fmt
diff --git a/Database/HDBC/SqlValue.hs b/Database/HDBC/SqlValue.hs
index d2151df..4029c16 100644
--- a/Database/HDBC/SqlValue.hs
+++ b/Database/HDBC/SqlValue.hs
@@ -18,7 +18,7 @@ import qualified System.Time as ST
 import Data.Time
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
-import System.Locale
+import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat)
 import Data.Ratio
 import Control.Monad.Error
 import Data.Convertible
diff --git a/HDBC.cabal b/HDBC.cabal
index dfa63a2..7197098 100644
--- a/HDBC.cabal
+++ b/HDBC.cabal
@@ -48,7 +48,7 @@ library
 
   Exposed-Modules: Database.HDBC, Database.HDBC.Types, Database.HDBC.DriverUtils,
     Database.HDBC.ColTypes, Database.HDBC.Statement, Database.HDBC.SqlValue
-  Other-Modules: Database.HDBC.Utils
+  Other-Modules: Database.HDBC.Utils, Database.HDBC.Locale
   Extensions: ExistentialQuantification, CPP, MultiParamTypeClasses,
     FlexibleContexts, TypeSynonymInstances, TypeOperators, RankNTypes,
     FlexibleInstances
diff --git a/testsrc/TestSqlValue.hs b/testsrc/TestSqlValue.hs
index 8fb8d15..f73b0b3 100644
--- a/testsrc/TestSqlValue.hs
+++ b/testsrc/TestSqlValue.hs
@@ -14,7 +14,7 @@ import qualified Test.HUnit as HU
 import Database.HDBC
 import Data.Time.Format
 import Data.Time.LocalTime
-import System.Locale
+import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat)
 import Data.Maybe
 
 instance Eq ZonedTime where

-- 
Haskell Database Connectivity