haskelldb-hsql-odbc 0.10 → 1.0.0

raw patch · 4 files changed

+62/−10 lines, 4 filesdep −haskell98dep ~basedep ~haskelldbdep ~haskelldb-hsqlnew-component:exe:DBDirect-hsql-odbcnew-uploader

Dependencies removed: haskell98

Dependency ranges changed: base, haskelldb, haskelldb-hsql

Files

• DBDirect.hs +5/−0
• Database/HaskellDB/HSQL/ODBC.hs +9/−2
• LICENSE +31/−0
• haskelldb-hsql-odbc.cabal +17/−8

@@ -0,0 +1,5 @@+import Database.HaskellDB.HSQL.ODBC+import Database.HaskellDB.DBDirect++main :: IO ()+main = dbdirect driver

@@ -40,10 +40,17 @@ odbcDriverConnect gen opts =     hsqlConnect gen (ODBC.driverConnect opts) +options :: [(String, String)]+options =+    ("dsn", "Data Source Name") :+    ("uid", "User") :+    ("pwd", "Password") :+    []+ odbcConnectOpts :: MonadIO m => [(String,String)] -> (Database -> m a) -> m a odbcConnectOpts opts f =      do-    [a,b,c] <- getOptions ["dsn","uid","pwd"] opts+    [a,b,c] <- getAnnotatedOptions options opts     g <- getGenerator opts     odbcConnect g (ODBCOptions {dsn = a,                                 uid = b,@@ -52,4 +59,4 @@ -- | This driver requires the following options:  --   "dsn", "uid", "pwd" driver :: DriverInterface-driver = defaultdriver { connect = odbcConnectOpts }+driver = defaultdriver { connect = odbcConnectOpts, requiredOptions = options }

@@ -0,0 +1,31 @@+Copyright (c) 1999 Daan Leijen, daan@cs.uu.nl+Copyright (c) 2003-2004 The HaskellDB development team+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 names of the copyright holders nor the names of the+      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.

@@ -1,15 +1,24 @@ Name: haskelldb-hsql-odbc-Version: 0.10+Version: 1.0.0+Cabal-version: >= 1.6+Homepage: https://github.com/m4dc4p/haskelldb+Build-type: Simple Copyright: The authors Maintainer: haskelldb-users@lists.sourceforge.net Author: Daan Leijen, Conny Andersson, Martin Andersson, Mary Bergman, Victor Blomqvist, Bjorn Bringert, Anders Hockersten, Torbjorn Martin, Jeremy Shaw License: BSD3-build-depends: haskell98, base, mtl, haskelldb, haskelldb-hsql, hsql, hsql-odbc-Extensions: ExistentialQuantification,-            OverlappingInstances,-            UndecidableInstances,-            MultiParamTypeClasses+License-File: LICENSE Synopsis: HaskellDB support for the HSQL ODBC driver.-Exposed-Modules:+Category: Database++Library+  Build-depends: base >=3 && < 5, mtl, haskelldb==0.11, haskelldb-hsql==0.11, hsql, hsql-odbc+  Exposed-Modules:         Database.HaskellDB.HSQL.ODBC-ghc-options: -O2++Executable DBDirect-hsql-odbc+  Main-is: DBDirect.hs++Source-repository head+  Type:       git+  Location:   https://github.com/m4dc4p/haskelldb