packages feed

persistent 1.2.0 → 1.2.0.1

raw patch · 9 files changed

+12/−191 lines, 9 files

Files

Database/Persist/Class/PersistField.hs view
@@ -15,15 +15,13 @@     ) where  import Database.Persist.Types.Base-import Data.Monoid (mappend) import Data.Time (Day(..), TimeOfDay, UTCTime) #ifdef HIGH_PRECISION_DATE import Data.Time.Clock.POSIX (posixSecondsToUTCTime) #endif-import Data.Time.LocalTime (ZonedTime, zonedTimeToUTC, zonedTimeToLocalTime, zonedTimeZone)+import Data.Time.LocalTime (ZonedTime) import Data.ByteString.Char8 (ByteString, unpack) import Control.Applicative-import Data.Typeable (Typeable) import Data.Int (Int8, Int16, Int32, Int64) import Data.Word (Word, Word8, Word16, Word32, Word64) import Data.Text (Text)@@ -37,57 +35,17 @@ import qualified Data.Text.Lazy as TL import qualified Data.ByteString.Lazy as L -import qualified Control.Exception as E-import Control.Monad.Trans.Error (Error (..))--import Data.Bits (bitSize)-import Control.Monad (liftM, (<=<))-import Control.Arrow (second)+import Control.Monad ((<=<))  import qualified Data.Text.Encoding as T import qualified Data.Text.Encoding.Error as T-import Web.PathPieces (PathPiece (..))-import qualified Data.Text.Read -import Data.Aeson (Value)-import Data.Aeson.Types (Parser) import qualified Data.Aeson as A-import qualified Data.Attoparsec.Number as AN-import qualified Data.Vector as V  import qualified Data.Set as S import qualified Data.Map as M-import qualified Data.HashMap.Strict as HM  import qualified Data.Text.Encoding as TE-import qualified Data.ByteString.Base64 as B64--import Data.Aeson (toJSON)-import Data.Aeson.Encode (fromValue)-import Data.Text.Lazy (toStrict)-import Data.Text.Lazy.Builder (toLazyText)--import Control.Monad.Trans.Control (MonadBaseControl)-import Control.Monad.Trans.Class (lift)-import Control.Monad.IO.Class (MonadIO, liftIO)-import Data.Monoid (Monoid)--import Data.Conduit.Internal (Pipe, ConduitM)-import Control.Monad.Logger (LoggingT)-import Control.Monad.Trans.Identity ( IdentityT)-import Control.Monad.Trans.List     ( ListT    )-import Control.Monad.Trans.Maybe    ( MaybeT   )-import Control.Monad.Trans.Error    ( ErrorT   )-import Control.Monad.Trans.Reader   ( ReaderT  )-import Control.Monad.Trans.Cont     ( ContT  )-import Control.Monad.Trans.State    ( StateT   )-import Control.Monad.Trans.Writer   ( WriterT  )-import Control.Monad.Trans.RWS      ( RWST     )-import Control.Monad.Trans.Resource ( ResourceT)--import qualified Control.Monad.Trans.RWS.Strict    as Strict ( RWST   )-import qualified Control.Monad.Trans.State.Strict  as Strict ( StateT )-import qualified Control.Monad.Trans.Writer.Strict as Strict ( WriterT )  -- | A value which can be marshalled to and from a 'PersistValue'. class PersistField a where
Database/Persist/Class/PersistQuery.hs view
@@ -4,55 +4,11 @@     ( PersistQuery (..)     ) where -import Data.Monoid (mappend) import Control.Exception (throwIO) import Database.Persist.Types-import Data.Time (Day, TimeOfDay, UTCTime)-import Data.Time.LocalTime (ZonedTime, zonedTimeToUTC, zonedTimeToLocalTime, zonedTimeZone)-import Data.ByteString.Char8 (ByteString, unpack)-import Control.Applicative-import Data.Typeable (Typeable)-import Data.Int (Int8, Int16, Int32, Int64)-import Data.Word (Word8, Word16, Word32, Word64) -import Text.Blaze.Html-import Text.Blaze.Html.Renderer.Text (renderHtml)--import qualified Data.Text as T-import qualified Data.Text.Lazy as TL-import qualified Data.ByteString.Lazy as L--import qualified Control.Exception as E import Control.Monad.Trans.Error (Error (..)) -import Data.Bits (bitSize)-import Control.Monad (liftM, (<=<))-import Control.Arrow (second)--import qualified Data.Text.Encoding as T-import qualified Data.Text.Encoding.Error as T-import Web.PathPieces (PathPiece (..))-import qualified Data.Text.Read--import Data.Aeson (Value)-import Data.Aeson.Types (Parser)-import qualified Data.Aeson as A-import qualified Data.Attoparsec.Number as AN-import qualified Data.Vector as V--import qualified Data.Set as S-import qualified Data.Map as M-import qualified Data.HashMap.Strict as HM--import qualified Data.Text.Encoding as TE-import qualified Data.ByteString.Base64 as B64--import Data.Aeson (toJSON)-import Data.Aeson.Encode (fromValue)-import Data.Text.Lazy (toStrict)-import Data.Text.Lazy.Builder (toLazyText)--import Control.Monad.Trans.Control (MonadBaseControl) import Control.Monad.Trans.Class (lift) import Control.Monad.IO.Class (MonadIO, liftIO) import Data.Monoid (Monoid)
Database/Persist/Class/PersistStore.hs view
@@ -6,55 +6,10 @@  import qualified Prelude import Prelude hiding ((++), show)-import Data.Monoid (mappend)-import Data.Time (Day, TimeOfDay, UTCTime)-import Data.Time.LocalTime (ZonedTime, zonedTimeToUTC, zonedTimeToLocalTime, zonedTimeZone)-import Data.ByteString.Char8 (ByteString, unpack)-import Control.Applicative-import Data.Typeable (Typeable)-import Data.Int (Int8, Int16, Int32, Int64)-import Data.Word (Word8, Word16, Word32, Word64) -import Text.Blaze.Html-import Text.Blaze.Html.Renderer.Text (renderHtml)--import qualified Data.Text as T-import qualified Data.Text.Lazy as TL-import qualified Data.ByteString.Lazy as L--import qualified Control.Exception as E import Control.Monad.Trans.Error (Error (..))--import Data.Bits (bitSize)-import Control.Monad (liftM, (<=<))-import Control.Arrow (second)--import qualified Data.Text.Encoding as T-import qualified Data.Text.Encoding.Error as T-import Web.PathPieces (PathPiece (..))-import qualified Data.Text.Read--import Data.Aeson (Value)-import Data.Aeson.Types (Parser)-import qualified Data.Aeson as A-import qualified Data.Attoparsec.Number as AN-import qualified Data.Vector as V--import qualified Data.Set as S-import qualified Data.Map as M-import qualified Data.HashMap.Strict as HM--import qualified Data.Text.Encoding as TE-import qualified Data.ByteString.Base64 as B64--import Data.Aeson (toJSON)-import Data.Aeson.Encode (fromValue)-import Data.Text.Lazy (toStrict)-import Data.Text.Lazy.Builder (toLazyText)--import Control.Monad.Trans.Control (MonadBaseControl) import Control.Monad.Trans.Class (lift)-import Control.Monad.IO.Class (MonadIO, liftIO)+import Control.Monad.IO.Class (MonadIO) import Data.Monoid (Monoid)  import Data.Conduit.Internal (Pipe, ConduitM)
Database/Persist/Class/PersistUnique.hs view
@@ -6,58 +6,13 @@  import qualified Prelude import Prelude hiding ((++), show)-import Data.Monoid (mappend)-import Data.Time (Day, TimeOfDay, UTCTime)-import Data.Time.LocalTime (ZonedTime, zonedTimeToUTC, zonedTimeToLocalTime, zonedTimeZone)-import Data.ByteString.Char8 (ByteString, unpack)-import Control.Applicative-import Data.Typeable (Typeable)-import Data.Int (Int8, Int16, Int32, Int64)-import Data.Word (Word8, Word16, Word32, Word64) -import Text.Blaze.Html-import Text.Blaze.Html.Renderer.Text (renderHtml)--import qualified Data.Text as T-import qualified Data.Text.Lazy as TL-import qualified Data.ByteString.Lazy as L--import qualified Control.Exception as E+import Control.Monad (liftM) import Control.Monad.Trans.Error (Error (..))--import Data.Bits (bitSize)-import Control.Monad (liftM, (<=<))-import Control.Arrow (second)--import qualified Data.Text.Encoding as T-import qualified Data.Text.Encoding.Error as T-import Web.PathPieces (PathPiece (..))-import qualified Data.Text.Read--import Data.Aeson (Value)-import Data.Aeson.Types (Parser)-import qualified Data.Aeson as A-import qualified Data.Attoparsec.Number as AN-import qualified Data.Vector as V--import qualified Data.Set as S-import qualified Data.Map as M-import qualified Data.HashMap.Strict as HM--import qualified Data.Text.Encoding as TE-import qualified Data.ByteString.Base64 as B64--import Data.Aeson (toJSON)-import Data.Aeson.Encode (fromValue)-import Data.Text.Lazy (toStrict)-import Data.Text.Lazy.Builder (toLazyText)--import Control.Monad.Trans.Control (MonadBaseControl) import Control.Monad.Trans.Class (lift)-import Control.Monad.IO.Class (MonadIO, liftIO) import Data.Monoid (Monoid) -import Data.Conduit.Internal (Pipe, ConduitM)+import Data.Conduit.Internal (Pipe) import Control.Monad.Logger (LoggingT) import Control.Monad.Trans.Identity ( IdentityT) import Control.Monad.Trans.List     ( ListT    )
Database/Persist/Sql/Class.hs view
@@ -306,9 +306,9 @@     sqlType a =         SqlNumeric long prec       where-        prec = round $ (log $ fromIntegral $ resolution n) / (log 10) --  FIXME: May lead to problems with big numbers-        long = prec + 10                                              --  FIXME: Is this enough ?+        prec = round $ (log $ fromIntegral $ resolution n) / (log 10 :: Double) --  FIXME: May lead to problems with big numbers+        long = prec + 10                                                        --  FIXME: Is this enough ?         n = 0-        mn = return n `asTypeOf` a+        _mn = return n `asTypeOf` a instance PersistFieldSql Rational where-    sqlType a = SqlNumeric 22 12   --  FIXME: Ambigous, 12 is from Pico which is used to convert Rational to number string+    sqlType _ = SqlNumeric 22 12   --  FIXME: Ambigous, 12 is from Pico which is used to convert Rational to number string
Database/Persist/Sql/Internal.hs view
@@ -6,7 +6,6 @@     ) where  import Database.Persist.Types-import Database.Persist.Class import Database.Persist.Quasi import Data.Char (isSpace) import Data.Text (Text)@@ -14,7 +13,6 @@ import Data.Monoid (Monoid, mappend, mconcat) import Data.Maybe (mapMaybe, listToMaybe) import Database.Persist.Sql.Types-import Database.Persist.Sql.Class  -- | Create the list of columns for the given entity. mkColumns :: [EntityDef a] -> EntityDef SqlType -> ([Column], [UniqueDef])
Database/Persist/Sql/Migration.hs view
@@ -25,7 +25,6 @@ import Database.Persist.Sql.Types import Database.Persist.Sql.Class import Database.Persist.Sql.Raw-import Database.Persist.Class import Database.Persist.Types  allSql :: CautiousMigration -> [Sql]
Database/Persist/Types/Base.hs view
@@ -119,8 +119,8 @@ type Attr = Text  data FieldType-    = FTTypeCon (Maybe Text) -- ^ optional module-                Text         -- ^ name+    = FTTypeCon (Maybe Text) Text+      -- ^ Optional module and name.     | FTApp FieldType FieldType     | FTList FieldType   deriving (Show, Eq, Read, Ord)
persistent.cabal view
@@ -1,5 +1,5 @@ name:            persistent-version:         1.2.0+version:         1.2.0.1 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>