mysql-simple 0.2.2.4 → 0.2.2.5
raw patch · 5 files changed
+82/−5 lines, 5 filesdep ~time
Dependency ranges changed: time
Files
- Database/MySQL/Simple/Param.hs +7/−2
- Database/MySQL/Simple/QueryResults.hs +66/−0
- Database/MySQL/Simple/Result.hs +6/−1
- Database/MySQL/Simple/Types.hs +1/−1
- mysql-simple.cabal +2/−1
Database/MySQL/Simple/Param.hs view
@@ -1,4 +1,4 @@-{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, FlexibleInstances,+{-# LANGUAGE CPP, DeriveDataTypeable, DeriveFunctor, FlexibleInstances, OverloadedStrings #-} -- |@@ -35,13 +35,18 @@ import Data.Typeable (Typeable) import Data.Word (Word, Word8, Word16, Word32, Word64) import Database.MySQL.Simple.Types (Binary(..), In(..), Null)-import System.Locale (defaultTimeLocale) import qualified Blaze.ByteString.Builder.Char.Utf8 as Utf8 import qualified Data.ByteString as SB import qualified Data.ByteString.Lazy as LB import qualified Data.Text as ST import qualified Data.Text.Encoding as ST import qualified Data.Text.Lazy as LT++#if MIN_VERSION_time(1,5,0)+import Data.Time.Format (defaultTimeLocale)+#else+import System.Locale (defaultTimeLocale)+#endif -- | How to render an element when substituting it into a query. data Action =
Database/MySQL/Simple/QueryResults.hs view
@@ -153,6 +153,72 @@ !j = convert fj vj convertResults fs vs = convertError fs vs 10 +instance (Result a, Result b, Result c, Result d, Result e, Result f,+ Result g, Result h, Result i, Result j, Result k) =>+ QueryResults (a,b,c,d,e,f,g,h,i,j,k) where+ convertResults [fa,fb,fc,fd,fe,ff,fg,fh,fi,fj,fk]+ [va,vb,vc,vd,ve,vf,vg,vh,vi,vj,vk] =+ (a,b,c,d,e,f,g,h,i,j,k)+ where !a = convert fa va; !b = convert fb vb; !c = convert fc vc+ !d = convert fd vd; !e = convert fe ve; !f = convert ff vf+ !g = convert fg vg; !h = convert fh vh; !i = convert fi vi+ !j = convert fj vj; !k = convert fk vk+ convertResults fs vs = convertError fs vs 11++instance (Result a, Result b, Result c, Result d, Result e, Result f,+ Result g, Result h, Result i, Result j, Result k, Result l) =>+ QueryResults (a,b,c,d,e,f,g,h,i,j,k,l) where+ convertResults [fa,fb,fc,fd,fe,ff,fg,fh,fi,fj,fk,fl]+ [va,vb,vc,vd,ve,vf,vg,vh,vi,vj,vk,vl] =+ (a,b,c,d,e,f,g,h,i,j,k,l)+ where !a = convert fa va; !b = convert fb vb; !c = convert fc vc+ !d = convert fd vd; !e = convert fe ve; !f = convert ff vf+ !g = convert fg vg; !h = convert fh vh; !i = convert fi vi+ !j = convert fj vj; !k = convert fk vk; !l = convert fl vl+ convertResults fs vs = convertError fs vs 12++instance (Result a, Result b, Result c, Result d, Result e, Result f,+ Result g, Result h, Result i, Result j, Result k, Result l,+ Result m) =>+ QueryResults (a,b,c,d,e,f,g,h,i,j,k,l,m) where+ convertResults [fa,fb,fc,fd,fe,ff,fg,fh,fi,fj,fk,fl,fm]+ [va,vb,vc,vd,ve,vf,vg,vh,vi,vj,vk,vl,vm] =+ (a,b,c,d,e,f,g,h,i,j,k,l,m)+ where !a = convert fa va; !b = convert fb vb; !c = convert fc vc+ !d = convert fd vd; !e = convert fe ve; !f = convert ff vf+ !g = convert fg vg; !h = convert fh vh; !i = convert fi vi+ !j = convert fj vj; !k = convert fk vk; !l = convert fl vl+ !m = convert fm vm+ convertResults fs vs = convertError fs vs 13++instance (Result a, Result b, Result c, Result d, Result e, Result f,+ Result g, Result h, Result i, Result j, Result k, Result l,+ Result m, Result n) =>+ QueryResults (a,b,c,d,e,f,g,h,i,j,k,l,m,n) where+ convertResults [fa,fb,fc,fd,fe,ff,fg,fh,fi,fj,fk,fl,fm,fn]+ [va,vb,vc,vd,ve,vf,vg,vh,vi,vj,vk,vl,vm,vn] =+ (a,b,c,d,e,f,g,h,i,j,k,l,m,n)+ where !a = convert fa va; !b = convert fb vb; !c = convert fc vc+ !d = convert fd vd; !e = convert fe ve; !f = convert ff vf+ !g = convert fg vg; !h = convert fh vh; !i = convert fi vi+ !j = convert fj vj; !k = convert fk vk; !l = convert fl vl+ !m = convert fm vm; !n = convert fn vn+ convertResults fs vs = convertError fs vs 14++instance (Result a, Result b, Result c, Result d, Result e, Result f,+ Result g, Result h, Result i, Result j, Result k, Result l,+ Result m, Result n, Result o) =>+ QueryResults (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) where+ convertResults [fa,fb,fc,fd,fe,ff,fg,fh,fi,fj,fk,fl,fm,fn,fo]+ [va,vb,vc,vd,ve,vf,vg,vh,vi,vj,vk,vl,vm,vn,vo] =+ (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)+ where !a = convert fa va; !b = convert fb vb; !c = convert fc vc+ !d = convert fd vd; !e = convert fe ve; !f = convert ff vf+ !g = convert fg vg; !h = convert fh vh; !i = convert fi vi+ !j = convert fj vj; !k = convert fk vk; !l = convert fl vl+ !m = convert fm vm; !n = convert fn vn; !o = convert fo vo+ convertResults fs vs = convertError fs vs 15+ -- | Throw a 'ConversionFailed' exception, indicating a mismatch -- between the number of columns in the 'Field' and row, and the -- number in the collection to be converted to.
Database/MySQL/Simple/Result.hs view
@@ -41,13 +41,18 @@ import Data.Typeable (TypeRep, Typeable, typeOf) import Data.Word (Word, Word8, Word16, Word32, Word64) import Database.MySQL.Base.Types (Field(..), Type(..))-import System.Locale (defaultTimeLocale) import qualified Data.ByteString as SB import qualified Data.ByteString.Char8 as B8 import qualified Data.ByteString.Lazy as LB import qualified Data.Text as ST import qualified Data.Text.Encoding as ST import qualified Data.Text.Lazy as LT++#if MIN_VERSION_time(1,5,0)+import Data.Time.Format (defaultTimeLocale)+#else+import System.Locale (defaultTimeLocale)+#endif -- | Exception thrown if conversion from a SQL value to a Haskell -- value fails.
Database/MySQL/Simple/Types.hs view
@@ -96,7 +96,7 @@ -- -- Example: ----- > query c "select * from whatever where id in ?" (In [3,4,5])+-- > query c "select * from whatever where id in ?" (Only (In [3,4,5])) newtype In a = In a deriving (Eq, Ord, Read, Show, Typeable, Functor)
mysql-simple.cabal view
@@ -1,5 +1,5 @@ name: mysql-simple-version: 0.2.2.4+version: 0.2.2.5 homepage: https://github.com/bos/mysql-simple bug-reports: https://github.com/bos/mysql-simple/issues synopsis: A mid-level MySQL client library.@@ -28,6 +28,7 @@ flag developer description: operate in developer mode default: False+ manual: True library exposed-modules: