hsql-postgresql 1.7.2 → 1.7.3

raw patch · 5 files changed

+56/−8 lines, 5 filessetup-changedPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• ChangeLog +5/−0
• Database/HSQL/PostgreSQL.hsc +1/−1
• LICENSE +29/−0
• Setup.lhs +18/−6
• hsql-postgresql.cabal +3/−1

@@ -1,3 +1,8 @@+2009-2-15+    1.7.3: filtering out of zombie dir paths returned+               `pg_config --includedir-server',+	   (headers are usually in the top include directory then)+	   to prevent unnecessary error exit.  2009-2-13     1.7.2: constrained requirement of `base' by `>=4.0.0.0' to stop cabal-install            from assuming base-3.?.?.? 

@@ -7,7 +7,7 @@     Stability   :  provisional     Portability :  portable -    The module provides interface to PostgreSQL database+    The module provides an interface to PostgreSQL database -} ----------------------------------------------------------------------------------------- 

@@ -0,0 +1,29 @@+Copyright (c) 2009, Krasimir Angelov <kr.angelov@gmail.com>+All rights reserved.++Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions+are met:++* Redistributions of source code must retain the above copyright+  notice, this list of conditions and the following disclaimer.++* Redistributions in binary form must reproduce the above copyright+  notice, this list of conditions and the following disclaimer in the+  documentation and/or other materials provided with the distribution.++* Neither the name of the author nor the names of its contributors+  may be used to endorse or promote products derived from this software+  without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@@ -12,7 +12,7 @@ import Distribution.Simple.Setup(ConfigFlags(configVerbosity),Flag(Flag)) import Distribution.Verbosity(Verbosity,silent) import System.Exit(ExitCode(ExitSuccess),exitWith)-import System.Directory(removeFile,findExecutable)+import System.Directory(removeFile,findExecutable,doesDirectoryExist) import System.Process(runInteractiveProcess, waitForProcess) import System.IO(hClose, hGetContents, hPutStr, stderr) import Control.Monad(when)@@ -69,21 +69,33 @@  Populate BuildInfo using pkg-config tool. \begin{code}-pqConfigBuildInfo :: (Flag Verbosity) -> IO (Maybe BuildInfo)+pqConfigBuildInfo:: (Flag Verbosity)-> IO (Maybe BuildInfo) pqConfigBuildInfo verbosity = do   mb_pq_config_path <- findProgram "pg_config" Nothing   case mb_pq_config_path of     Just pq_config_path -> do        message ("configuring pq library")         res <- rawSystemGrabOutput verbosity pq_config_path ["--libdir"]-       let lib_dirs = words res+       let lib_dirs= words res        res <- rawSystemGrabOutput verbosity pq_config_path ["--includedir"]-       let inc_dirs = words res+       let inc_dirs= words res        res <- rawSystemGrabOutput verbosity pq_config_path ["--includedir-server"]-       let inc_dirs_server = words res-       let bi = emptyBuildInfo{extraLibDirs=lib_dirs, includeDirs=inc_dirs++inc_dirs_server}+       let inc_dirs_server'= words res+       inc_dirs_server <-onlyExistingDirsOf inc_dirs_server'+       let bi= emptyBuildInfo{extraLibDirs= lib_dirs+                             ,includeDirs= inc_dirs++inc_dirs_server}        return (Just bi)     Nothing -> do        message ("The package will be built using default settings for pq library")        return Nothing++onlyExistingDirsOf:: [FilePath]-> IO [FilePath]+onlyExistingDirsOf [] = return []+onlyExistingDirsOf (dirPath:restPaths') = do+  restPaths <-onlyExistingDirsOf restPaths'+  exists <-doesDirectoryExist dirPath+  if exists then return (dirPath:restPaths) +            else do message ("missing directory: "++dirPath)+                    return restPaths+ \end{code}

@@ -1,6 +1,8 @@ Name:		 hsql-postgresql-Version:	 1.7.2+Version:	 1.7.3+Synopsis:	 A Haskell Interface to PostgreSQL via the PQ library.  License:	 BSD3+License-file:	 LICENSE Author:		 Krasimir Angelov <kr.angelov@gmail.com> Category:	 Database Description: 	 PostgreSQL driver for HSQL.