git.iko.soy/project-m36
on master help sign in
fix examples broken by refactoring
commit415eb12c23adcdd54502a3bd68bffbeb6cfe86f9 authorAgentM <agentm@themactionfaction.com> dateTue 1 Aug 2017, 12:36 (9 years ago) parent55bbfa9
3 files changed+10−13
compare with master
unifiedsplit
examples/SimpleClient.hs+1−1 examples/hair.hs+3−6 examples/out_of_the_tarpit.hs+6−6
examples/SimpleClient.hs+1−1
@@ -12,7 +12,7 @@ main = do
1212 Left err -> putStrLn (show err)
1313 Right conn -> do
1414 --3. create a session on the "master" branch
15− eSessionId <- createSessionAtHead "master" conn
15+ eSessionId <- createSessionAtHead conn "master"
1616 case eSessionId of
1717 Left err -> putStrLn (show err)
1818 Right sessionId -> do
examples/hair.hs+3−6
@@ -23,17 +23,14 @@ main = do
2323 conn <- eCheck $ connectProjectM36 connInfo
2424
2525 --create a database session at the default branch of the fresh database
26− sessionId <- eCheck $ createSessionAtHead "master" conn
26+ sessionId <- eCheck $ createSessionAtHead conn "master"
2727
28− let mCheck v = v >>= \x -> case x of
29− Just err -> error (show err)
30− Nothing -> pure ()
3128 --create the data type in the database context
32− mCheck $ executeDatabaseContextExpr sessionId conn (toDatabaseContextExpr (undefined :: Hair))
29+ eCheck $ executeDatabaseContextExpr sessionId conn (toDatabaseContextExpr (undefined :: Hair))
3330
3431 --create a relation with the new Hair AtomType
3532 let blond = NakedAtomExpr (toAtom Blond)
36− mCheck $ executeDatabaseContextExpr sessionId conn (Assign "people" (MakeRelationFromExprs Nothing [
33+ eCheck $ executeDatabaseContextExpr sessionId conn (Assign "people" (MakeRelationFromExprs Nothing [
3734 TupleExpr (M.fromList [("hair", blond), ("name", NakedAtomExpr (TextAtom "Colin"))])]))
3835
3936 let restrictionPredicate = AttributeEqualityPredicate "hair" blond
examples/out_of_the_tarpit.hs+6−6
@@ -3,7 +3,7 @@
33import ProjectM36.Client
44import ProjectM36.DataTypes.Primitive
55import qualified Data.Map as M
6−import Data.Maybe
6+import Data.Either
77import Control.Monad
88import GHC.Generics
99import Data.Binary
@@ -57,7 +57,7 @@ main = do
5757 let conn = check eConn
5858
5959 --create a database session at the default branch of the fresh database
60− eSessionId <- createSessionAtHead "master" conn
60+ eSessionId <- createSessionAtHead conn "master"
6161 let sessionId = check eSessionId
6262
6363 createSchema sessionId conn
@@ -141,10 +141,10 @@ createSchema sessionId conn = do
141141 createScriptedAtomFunction "datesToSpeedBand" [dayTypeConstructor, dayTypeConstructor] (ADTypeConstructor "SpeedBand" []) speedBandScript
142142 ]
143143 --gather up and execute all database updates
144− mErrs <- mapM (executeDatabaseContextExpr sessionId conn) (new_adts ++ rvDefs ++ incDepKeys ++ incDepForeignKeys)
145− let errs = catMaybes mErrs
144+ eErrs <- mapM (executeDatabaseContextExpr sessionId conn) (new_adts ++ rvDefs ++ incDepKeys ++ incDepForeignKeys)
145+ let errs = lefts eErrs
146146 when (length errs > 0) (error (show errs))
147147
148− mErrs' <- mapM (executeDatabaseContextIOExpr sessionId conn) atomFuncs
149− let errs' = catMaybes mErrs'
148+ eErrs' <- mapM (executeDatabaseContextIOExpr sessionId conn) atomFuncs
149+ let errs' = lefts eErrs'
150150 when (length errs' > 0) (error (show errs'))