c981acc · project-m36 · git.iko.soy

git.iko.soy/project-m36

Move OverloadedStrings from language pragmas to cabal file

commitc981acc1b9aa12c95eb664c6687c6a924fd599e3 authorDiogo Biazus <diogob@gmail.com> dateSat 23 Jul 2016, 15:13 (10 years ago) parent56b0f2d

49 files changed+49−72

compare with master

unifiedsplit

Database/Persist/ProjectM36.hs+1−1 ProjectM36/Atom.hs−1 ProjectM36/AtomFunction.hs+1−2 ProjectM36/AtomFunctions/Basic.hs+1−2 ProjectM36/AtomFunctions/Primitive.hs+1−2 ProjectM36/AtomType.hs−1 ProjectM36/Client.hs+1−1 ProjectM36/DataTypes/Basic.hs−7 ProjectM36/DataTypes/Day.hs−1 ProjectM36/DataTypes/Either.hs+1−2 ProjectM36/DataTypes/Interval.hs+2−2 ProjectM36/DataTypes/Maybe.hs+1−2 ProjectM36/DataTypes/Primitive.hs−1 ProjectM36/DatabaseContext.hs−1 ProjectM36/DateExamples.hs−1 ProjectM36/Key.hs−1 ProjectM36/Relation.hs+1−1 ProjectM36/Relation/Parse/CSV.hs−1 ProjectM36/Relation/Show/CSV.hs−1 ProjectM36/Relation/Show/Gnuplot.hs−1 ProjectM36/Relation/Show/HTML.hs−1 ProjectM36/Relation/Show/Term.hs−1 ProjectM36/RelationalExpression.hs+1−2 ProjectM36/Sessions.hs−1 ProjectM36/Transaction.hs−1 ProjectM36/TransactionGraph.hs+1−1 ProjectM36/TransactionGraph/Persist.hs−1 ProjectM36/TransactionGraph/Show.hs+1−2 TutorialD/Interpreter.hs+1−1 TutorialD/Interpreter/Base.hs−1 TutorialD/Interpreter/DatabaseContextExpr.hs−1 TutorialD/Interpreter/InformationOperator.hs+1−1 TutorialD/Interpreter/RODatabaseContextOperator.hs+2−2 TutorialD/tutd.hs+1−1 docs/on_null.markdown+1−1 examples/Hospital.hs+2−2 examples/SimpleClient.hs+1−2 examples/out_of_the_tarpit.hs+2−2 project-m36.cabal+18 test/Relation/Basic.hs+1−2 test/Relation/Export/CSV.hs−1 test/Relation/Import/CSV.hs−1 test/Relation/StaticOptimizer.hs−1 test/Server/Main.hs+1−2 test/TransactionGraph/Merge.hs−1 test/TransactionGraph/Persist.hs+2−2 test/TutorialD/Interpreter.hs+1−2 test/TutorialD/Interpreter/Import/TutorialD.hs+1−2 test/persistent-driver/test.hs+1−2

Database/Persist/ProjectM36.hs+1−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE RankNTypes, TypeFamilies, GeneralizedNewtypeDeriving, OverloadedStrings, FlexibleInstances, FlexibleContexts #-}

1+{-# LANGUAGE RankNTypes, TypeFamilies, GeneralizedNewtypeDeriving, FlexibleInstances, FlexibleContexts #-}

22{-# OPTIONS_GHC -fno-warn-orphans #-}

33module Database.Persist.ProjectM36 where

44import Database.Persist hiding (Assign, Update)

ProjectM36/Atom.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.Atom where

32import ProjectM36.Base

43import ProjectM36.Error

ProjectM36/AtomFunction.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.AtomFunction where

32import ProjectM36.Base

43import ProjectM36.Error

@@ -17,4 +16,4 @@ atomFunctionForName funcName funcSet = if HS.null foundFunc then

1716 foundFunc = HS.filter (\(AtomFunction name _ _) -> name == funcName) funcSet

1817

1918

20−

19+

ProjectM36/AtomFunctions/Basic.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21--atom functions on primitive atom values plus the basic atom functions

32module ProjectM36.AtomFunctions.Basic where

43import ProjectM36.Base

@@ -13,4 +12,4 @@ basicAtomFunctions = HS.unions [primitiveAtomFunctions,

1312 dayAtomFunctions,

1413 eitherAtomFunctions,

1514 maybeAtomFunctions]

16−

15+

ProjectM36/AtomFunctions/Primitive.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.AtomFunctions.Primitive where

32import ProjectM36.Atom

43import ProjectM36.Base

@@ -97,4 +96,4 @@ castInt (ConstructedAtom _ _ _) = error "castInt attempt on ConstructedAtom"

9796castInt (Atom atom) = case cast atom of

9897 Just i -> i

9998 Nothing -> error "int cast failure" -- the type checker must ensure this can never occur

100−

99+

ProjectM36/AtomType.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.AtomType where

32import ProjectM36.Base

43import ProjectM36.ConcreteTypeRep

ProjectM36/Client.hs+1−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE OverloadedStrings, DeriveAnyClass, DeriveGeneric #-}

1+{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}

22module ProjectM36.Client

33 (ConnectionInfo(..),

44 Connection(..),

ProjectM36/DataTypes/Basic.hs−7

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21-- wraps up primitives plus other basic data types

32module ProjectM36.DataTypes.Basic where

43import ProjectM36.DataTypes.Primitive

@@ -13,9 +12,3 @@ basicTypeConstructorMapping = (primitiveTypeConstructorMapping ++

1312 eitherTypeConstructorMapping ++

1413 dayTypeConstructorMapping)

1514

16−

17−

18−

19−

20−

21−

ProjectM36/DataTypes/Day.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.DataTypes.Day where

32import ProjectM36.Base

43import ProjectM36.DataTypes.Primitive

ProjectM36/DataTypes/Either.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.DataTypes.Either where

32import ProjectM36.Base

43import ProjectM36.DataTypes.Primitive

@@ -19,4 +18,4 @@ eitherAtomFunctions = HS.fromList [

1918 atomFuncType = [eitherAtomType AnyAtomType AnyAtomType, boolAtomType],

2019 atomFunc = \((ConstructedAtom dConsName _ _):_) -> Atom (dConsName == "Left")

2120 }

22− ]

21+ ]

ProjectM36/DataTypes/Interval.hs+2−2

@@ -1,4 +1,4 @@

1−{-# LANGUAGE GeneralizedNewtypeDeriving, StandaloneDeriving, OverloadedStrings #-}

1+{-# LANGUAGE GeneralizedNewtypeDeriving, StandaloneDeriving #-}

22{-# OPTIONS_GHC -fno-warn-orphans #-}

33module ProjectM36.DataTypes.Interval where

44import Data.Interval

@@ -34,4 +34,4 @@ intervalFunctions = [AtomFunction { atomFuncName = "interval_dt_member",

3434 boolAtomType],

3535 atomFunc = (\(dt:dtinterval:_) -> Atom $ member ((unsafeCast dt)::UTCTime) ((unsafeCast dtinterval)::(Interval UTCTime)))}

3636

37− ]

37+ ]

ProjectM36/DataTypes/Maybe.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.DataTypes.Maybe where

32import ProjectM36.Base

43import ProjectM36.DataTypes.Primitive

@@ -21,4 +20,4 @@ maybeAtomFunctions = HS.fromList [

2120 atomFuncType = [maybeAtomType AnyAtomType, boolAtomType],

2221 atomFunc = \((ConstructedAtom dConsName _ _):_) -> Atom (dConsName == "Nothing")

2322 }

24− ]

23+ ]

ProjectM36/DataTypes/Primitive.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.DataTypes.Primitive where

32import ProjectM36.Base

43import Data.Proxy

ProjectM36/DatabaseContext.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.DatabaseContext where

32import ProjectM36.Base

43import qualified Data.Map as M

ProjectM36/DateExamples.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.DateExamples where

32import ProjectM36.Base

43import ProjectM36.Atom

ProjectM36/Key.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.Key where

32import ProjectM36.Base

43import ProjectM36.Relation

ProjectM36/Relation.hs+1−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE GADTs,ExistentialQuantification,OverloadedStrings #-}

1+{-# LANGUAGE GADTs,ExistentialQuantification #-}

22module ProjectM36.Relation where

33import qualified Data.Set as S

44import qualified Data.HashSet as HS

ProjectM36/Relation/Parse/CSV.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.Relation.Parse.CSV where

32--parse Relations from CSV

43import Data.Csv.Parser

ProjectM36/Relation/Show/CSV.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21{-# OPTIONS_GHC -fno-warn-orphans #-}

32module ProjectM36.Relation.Show.CSV where

43import ProjectM36.Base

ProjectM36/Relation/Show/Gnuplot.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.Relation.Show.Gnuplot where

32import ProjectM36.Base

43import ProjectM36.Relation

ProjectM36/Relation/Show/HTML.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.Relation.Show.HTML where

32import ProjectM36.Base

43import ProjectM36.Relation

ProjectM36/Relation/Show/Term.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21--writes Relation to a String suitable for terminal output

32module ProjectM36.Relation.Show.Term where

43import ProjectM36.Base

ProjectM36/RelationalExpression.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.RelationalExpression where

32import ProjectM36.Relation

43import ProjectM36.Tuple

@@ -531,4 +530,4 @@ evalTupleExpr context attrs (TupleExpr tupMap) = do

531530 when (A.attributeNameSet finalAttrs /= A.attributeNameSet tupAttrs) (traceShow (finalAttrs,tupAttrs) $ Left (TupleAttributeTypeMismatchError tupAttrs))

532531 tup' <- resolveTypesInTuple finalAttrs (reorderTuple finalAttrs tup)

533532 _ <- validateTuple tup' tConss

534− pure tup'

533+ pure tup'

ProjectM36/Sessions.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.Sessions where

32import Control.Concurrent.STM

43import qualified STMContainers.Map as STMMap

ProjectM36/Transaction.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.Transaction where

32import ProjectM36.Base

43import qualified Data.Set as S

ProjectM36/TransactionGraph.hs+1−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE OverloadedStrings, DeriveAnyClass, DeriveGeneric #-}

1+{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}

22module ProjectM36.TransactionGraph where

33import ProjectM36.Base

44import ProjectM36.Error

ProjectM36/TransactionGraph/Persist.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.TransactionGraph.Persist where

32import ProjectM36.Error

43import ProjectM36.TransactionGraph

ProjectM36/TransactionGraph/Show.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module ProjectM36.TransactionGraph.Show where

32import ProjectM36.Base

43import ProjectM36.TransactionGraph

@@ -19,4 +18,4 @@ showGraphStructure graph@(TransactionGraph _ transSet) = S.foldr folder "" trans

1918 where

2019 folder trans acc = acc ++ showTransactionStructure trans graph ++ "\n"

2120

22−

21+

TutorialD/Interpreter.hs+1−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE GADTs,OverloadedStrings #-}

1+{-# LANGUAGE GADTs #-}

22module TutorialD.Interpreter where

33import TutorialD.Interpreter.Base

44import TutorialD.Interpreter.RODatabaseContextOperator

TutorialD/Interpreter/Base.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module TutorialD.Interpreter.Base where

32import Text.Parsec

43import Text.Parsec.String

TutorialD/Interpreter/DatabaseContextExpr.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21module TutorialD.Interpreter.DatabaseContextExpr where

32import Text.Parsec

43import Text.Parsec.String

TutorialD/Interpreter/InformationOperator.hs+1−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE CPP, OverloadedStrings #-}

1+{-# LANGUAGE CPP #-}

22module TutorialD.Interpreter.InformationOperator where

33import Data.Text

44import Text.Parsec

TutorialD/Interpreter/RODatabaseContextOperator.hs+2−2

@@ -1,4 +1,4 @@

1−{-# LANGUAGE GADTs,OverloadedStrings #-}

1+{-# LANGUAGE GADTs #-}

22module TutorialD.Interpreter.RODatabaseContextOperator where

33import ProjectM36.Base

44import qualified ProjectM36.Client as C

@@ -135,4 +135,4 @@ interpretRODatabaseContextOp sessionId conn tutdstring = case parse roDatabaseCo

135135 Left err -> pure $ DisplayErrorResult (T.pack (show err))

136136 Right parsed -> evalRODatabaseContextOp sessionId conn parsed

137137

138−

138+

TutorialD/tutd.hs+1−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE OverloadedStrings, CPP #-}

1+{-# LANGUAGE CPP #-}

22import TutorialD.Interpreter

33import ProjectM36.Base

44import ProjectM36.Client

docs/on_null.markdown+1−1

@@ -377,7 +377,7 @@ Algebraic data types in SQL are effectively impossible.

377377Any Haskell data type can be turned into a value (called an "atom") in Project:M36. The following example illustrates:

378378

379379```haskell

380−{-# LANGUAGE OverloadedStrings,DeriveAnyClass,DeriveGeneric #-}

380+{-# LANGUAGE DeriveAnyClass,DeriveGeneric #-}

381381module Hospital where

382382

383383import ProjectM36.Client

examples/Hospital.hs+2−2

@@ -1,4 +1,4 @@

1−{-# LANGUAGE OverloadedStrings,DeriveAnyClass,DeriveGeneric #-}

1+{-# LANGUAGE DeriveAnyClass,DeriveGeneric #-}

22module Hospital where

44import ProjectM36.Client

@@ -60,4 +60,4 @@ runExample = do

6060 Just age_value_out' -> do

6161 putStrLn (show (age_value_in == age_value_out'))

6262

63−

63+

examples/SimpleClient.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21import ProjectM36.Client

32import ProjectM36.TupleSet

43import ProjectM36.Atom

@@ -39,4 +38,4 @@ main = do

3938 Right rel -> putStrLn (show $ showRelation rel)

4039

4140 --7. close the connection

42− close conn

41+ close conn

examples/out_of_the_tarpit.hs+2−2

@@ -1,5 +1,5 @@

11-- the Out-of-the-Tarpit example in Haskell and Project:M36

2−{-# LANGUAGE OverloadedStrings, DeriveAnyClass #-}

2+{-# LANGUAGE DeriveAnyClass #-}

33import ProjectM36.Client

44import qualified Data.Text as T

55import ProjectM36.Atom

@@ -81,4 +81,4 @@ createSchema conn = do

8181 mapM executeDatabaseContextExpr dbcontextExprs

8282

8383

84−

84+

project-m36.cabal+18

@@ -117,6 +117,7 @@ Library

117117 C-sources: ProjectM36/DirectoryFsync.c

118118 Build-Depends: unix

119119 Default-Language: Haskell2010

120+ Default-Extensions: OverloadedStrings

120121

121122Executable tutd

122123 Build-Depends: base >=4.8 && <4.9,

@@ -216,6 +217,7 @@ Executable tutd

216217 CPP-Options: -DPROJECTM36_VERSION="v0.1"

217218 GHC-Options: -Wall

218219 Default-Language: Haskell2010

220+ Default-Extensions: OverloadedStrings

219221 if os(windows)

220222 Build-Depends: Win32 >= 2.3 && < 2.4

221223 Other-Modules: ProjectM36.Win32Handle

@@ -264,6 +266,7 @@ Executable project-m36-server

264266 GHC-Options: -Wall -threaded -rtsopts

265267 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

266268 Default-Language: Haskell2010

269+ Default-Extensions: OverloadedStrings

267270 Other-Modules: ProjectM36.Atom,

268271 ProjectM36.AtomFunction,

269272 ProjectM36.AtomFunctions.Basic,

@@ -314,6 +317,7 @@ Executable project-m36-server

314317

315318Executable bigrel

316319 Default-Language: Haskell2010

320+ Default-Extensions: OverloadedStrings

317321 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, optparse-applicative, stm-containers, list-t

318322 Other-Modules: ProjectM36.Base,

319323 ProjectM36.Relation

@@ -362,6 +366,7 @@ Executable bigrel

362366

363367Test-Suite test-tutoriald

364368 Default-Language: Haskell2010

369+ Default-Extensions: OverloadedStrings

365370 type: exitcode-stdio-1.0

366371 main-is: test/TutorialD/Interpreter.hs

367372 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers, list-t

@@ -378,6 +383,7 @@ Test-Suite test-tutoriald

378383

379384Test-Suite test-relation

380385 Default-Language: Haskell2010

386+ Default-Extensions: OverloadedStrings

381387 type: exitcode-stdio-1.0

382388 main-is: test/Relation/Basic.hs

383389 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers

@@ -387,6 +393,7 @@ Test-Suite test-relation

387393

388394Test-Suite test-static-optimizer

389395 Default-Language: Haskell2010

396+ Default-Extensions: OverloadedStrings

390397 type: exitcode-stdio-1.0

391398 main-is: test/Relation/StaticOptimizer.hs

392399 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers

@@ -396,6 +403,7 @@ Test-Suite test-static-optimizer

396403

397404Test-Suite test-transactiongraph-persist

398405 Default-Language: Haskell2010

406+ Default-Extensions: OverloadedStrings

399407 type: exitcode-stdio-1.0

400408 main-is: test/TransactionGraph/Persist.hs

401409 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers

@@ -412,6 +420,7 @@ Test-Suite test-transactiongraph-persist

412420

413421Test-Suite test-relation-import-csv

414422 Default-Language: Haskell2010

423+ Default-Extensions: OverloadedStrings

415424 type: exitcode-stdio-1.0

416425 main-is: test/Relation/Import/CSV.hs

417426 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers

@@ -421,6 +430,7 @@ Test-Suite test-relation-import-csv

421430

422431Test-Suite test-tutoriald-import-tutoriald

423432 Default-Language: Haskell2010

433+ Default-Extensions: OverloadedStrings

424434 type: exitcode-stdio-1.0

425435 main-is: test/TutorialD/Interpreter/Import/TutorialD.hs

426436 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers

@@ -430,6 +440,7 @@ Test-Suite test-tutoriald-import-tutoriald

430440

431441Test-Suite test-relation-export-csv

432442 Default-Language: Haskell2010

443+ Default-Extensions: OverloadedStrings

433444 type: exitcode-stdio-1.0

434445 main-is: test/Relation/Export/CSV.hs

435446 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers

@@ -439,6 +450,7 @@ Test-Suite test-relation-export-csv

439450

440451Test-Suite test-persistent-driver

441452 Default-Language: Haskell2010

453+ Default-Extensions: OverloadedStrings

442454 type: exitcode-stdio-1.0

443455 main-is: test/persistent-driver/test.hs

444456 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, template-haskell, transformers, aeson, persistent-template, conduit, persistent >= 2.2 && < 2.3, either, path-pieces, http-api-data, stm-containers, list-t

@@ -456,6 +468,7 @@ Test-Suite test-persistent-driver

456468

457469Test-Suite test-transactiongraph-merge

458470 Default-Language: Haskell2010

471+ Default-Extensions: OverloadedStrings

459472 type: exitcode-stdio-1.0

460473 main-is: test/TransactionGraph/Merge.hs

461474 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, template-haskell, transformers, aeson, persistent-template, conduit, persistent, either, path-pieces, http-api-data, stm-containers, list-t

@@ -466,6 +479,7 @@ Test-Suite test-transactiongraph-merge

466479

467480benchmark bench

468481 Default-Language: Haskell2010

482+ Default-Extensions: OverloadedStrings

469483 type: exitcode-stdio-1.0

470484 main-is: benchmark/Relation.hs

471485 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, criterion, stm-containers

@@ -474,6 +488,7 @@ benchmark bench

474488

475489Test-Suite test-server

476490 Default-Language: Haskell2010

491+ Default-Extensions: OverloadedStrings

477492 type: exitcode-stdio-1.0

478493 main-is: test/Server/Main.hs

479494 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t

@@ -491,6 +506,7 @@ Test-Suite test-server

491506

492507Executable Example-SimpleClient

493508 Default-Language: Haskell2010

509+ Default-Extensions: OverloadedStrings

494510 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t

495511 Main-Is: examples/SimpleClient.hs

496512 GHC-Options: -Wall

@@ -543,6 +559,7 @@ Executable Example-SimpleClient

543559

544560Executable Example-PersistClient

545561 Default-Language: Haskell2010

562+ Default-Extensions: OverloadedStrings

546563 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, persistent, aeson, path-pieces, either, conduit, http-api-data, template-haskell, persistent-template

547564 Main-Is: examples/PersistClient.hs

548565 GHC-Options: -Wall

@@ -593,6 +610,7 @@ Executable Example-PersistClient

593610

594611Test-Suite test-scripts

595612 Default-Language: Haskell2010

613+ Default-Extensions: OverloadedStrings

596614 type: exitcode-stdio-1.0

597615 main-is: test/scripts.hs

598616 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t

test/Relation/Basic.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21import Test.HUnit

32import ProjectM36.Base

43import ProjectM36.Relation

@@ -93,4 +92,4 @@ testMkRelationFromExprsBadAttrs = TestCase $ do

9392 let context = DBC.empty

9493 case evalState (evalRelationalExpr (MakeRelationFromExprs (Just [AttributeAndTypeNameExpr "badAttr1" (PrimitiveTypeConstructor "Int" intAtomType)]) [TupleExpr (M.singleton "badAttr2" (NakedAtomExpr (intAtom 1)))])) context of

9594 Left err -> assertEqual "tuple type mismatch" (TupleAttributeTypeMismatchError (A.attributesFromList [Attribute "badAttr2" intAtomType])) err

96− Right _ -> assertFailure "expected tuple type mismatch"

95+ Right _ -> assertFailure "expected tuple type mismatch"

test/Relation/Export/CSV.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21import Test.HUnit

32import ProjectM36.Base

43import System.Exit

test/Relation/Import/CSV.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21import Test.HUnit

32import ProjectM36.Base

43import ProjectM36.Relation.Parse.CSV

test/Relation/StaticOptimizer.hs−1

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21import ProjectM36.Base

32import ProjectM36.Relation

43import ProjectM36.DateExamples

test/Server/Main.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21{-

32test client/server interaction

43-}

@@ -163,4 +162,4 @@ testNotification mvar sess conn = TestCase $ do

163162 check $ commit sess conn

164163 check $ executeDatabaseContextExpr sess conn (Assign "x" (ExistingRelation relationFalse))

165164 check $ commit sess conn

166− takeMVar mvar

165+ takeMVar mvar

test/TransactionGraph/Merge.hs−1

@@ -1,5 +1,4 @@

11-- tests for transaction merging

2−{-# LANGUAGE OverloadedStrings #-}

32import Test.HUnit

43import ProjectM36.Base

54import ProjectM36.Relation

test/TransactionGraph/Persist.hs+2−2

@@ -1,4 +1,4 @@

1−{-# LANGUAGE OverloadedStrings,LambdaCase #-}

1+{-# LANGUAGE LambdaCase #-}

22import Test.HUnit

33import ProjectM36.Base

44import ProjectM36.Persist (DiskSync(NoDiskSync))

@@ -59,4 +59,4 @@ testDBSimplePersistence = TestCase $ withSystemTempDirectory "m36testdb" $ \temp

5959 Right graph'' -> assertBool "graph equality" $ graph'' == graph'

6060

6161

62−

62+

test/TutorialD/Interpreter.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21import TutorialD.Interpreter.DatabaseContextExpr

32import TutorialD.Interpreter

43import TutorialD.Interpreter.Base

@@ -316,4 +315,4 @@ testMergeTransactions = TestCase $ do

316315 eRv <- executeRelationalExpr sessionId dbconn (RelationVariable "conflictrv")

317316 case eRv of

318317 Left err -> assertFailure (show err)

319− Right conflictrv -> assertEqual "conflict union merge relvar" conflictCheck conflictrv

318+ Right conflictrv -> assertEqual "conflict union merge relvar" conflictCheck conflictrv

test/TutorialD/Interpreter/Import/TutorialD.hs+1−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE OverloadedStrings #-}

21import Test.HUnit

32import ProjectM36.Base

43import ProjectM36.Atom

@@ -20,4 +19,4 @@ testTutdImport = TestCase $ do

2019 hClose handle

2120 let expectedExpr = MultipleExpr [Assign "x" (MakeRelationFromExprs Nothing [TupleExpr (M.fromList [("a",NakedAtomExpr $ intAtom 5),("b",NakedAtomExpr $ textAtom "spam")])])]

2221 imported <- importTutorialD tempPath

23− assertEqual "import tutd" (Right expectedExpr) imported

22+ assertEqual "import tutd" (Right expectedExpr) imported

test/persistent-driver/test.hs+1−2

@@ -6,7 +6,6 @@

66{-# LANGUAGE TypeSynonymInstances #-}

77{-# LANGUAGE MultiParamTypeClasses #-}

88{-# LANGUAGE GeneralizedNewtypeDeriving #-}

9−{-# LANGUAGE OverloadedStrings #-}

109{-# LANGUAGE FlexibleInstances #-}

1110import Test.HUnit

1211import Database.Persist.ProjectM36

@@ -173,4 +172,4 @@ testSelectKeys = do

173172 keysList <- selectKeysList [PersonAge ==. age2] []

174173 liftIO $ assertEqual "select keysList len" 1 (length keysList)

175174 liftIO $ assertEqual "select keysList val" m2 (head keysList)

176−

175+