git.iko.soy/project-m36
on master help sign in
finish renaming evalDatabaseContextExpr in tests
commitaf92f0dce158f179a359812a575f5ac601635495 authorAgentM <agentm@themactionfaction.com> dateFri 7 Apr 2017, 21:37 (10 years ago) parenta0e6f44
4 files changed+4−6
compare with master
unifiedsplit
src/lib/ProjectM36/RelationalExpression.hs−1 test/TransactionGraph/Merge.hs+1−1 test/TutorialD/Interpreter.hs+3−2 test/TutorialD/Interpreter/DatabaseContextFunctionScript.hs−2
src/lib/ProjectM36/RelationalExpression.hs−1
@@ -26,7 +26,6 @@ import Control.Monad.Trans.Except
2626
2727import GHC
2828import GHC.Paths
29−import Debug.Trace
3029
3130-- we need to pass around a higher level RelationTuple and Attributes in order to solve #52
3231data RelationalExprStateElems = RelationalExprStateTupleElems DatabaseContext RelationTuple | -- used when fully evaluating a relexpr
test/TransactionGraph/Merge.hs+1−1
@@ -140,7 +140,7 @@ testSelectedBranchMerge = TestCase $ do
140140
141141 -- add another relvar to branchB
142142 branchBTrans <- assertMaybe (transactionForHead "branchB" graph) "failed to get branchB head"
143− updatedBranchBContext <- case runState (evalContextExpr (Assign "branchBOnlyRelvar" (ExistingRelation relationTrue))) (concreteDatabaseContext branchBTrans) of
143+ updatedBranchBContext <- case runState (evalDatabaseContextExpr (Assign "branchBOnlyRelvar" (ExistingRelation relationTrue))) (concreteDatabaseContext branchBTrans) of
144144 (Just err, _) -> assertFailure (show err) >> undefined
145145 (Nothing, context) -> pure context
146146 (_, graph') <- addTransaction "branchB" (createTrans (fakeUUID 3) (TransactionInfo (transactionId branchBTrans) S.empty) updatedBranchBContext) graph
test/TutorialD/Interpreter.hs+3−2
@@ -25,6 +25,7 @@ import Data.Text.Encoding as TE
2525import Control.Concurrent
2626import qualified Data.Set as S
2727import Data.Text hiding (map)
28+import qualified Data.Text as T
2829
2930main :: IO ()
3031main = do
@@ -391,6 +392,6 @@ testFunctionalDependencies = TestCase $ do
391392 --insert a new, valid tuple
392393 executeTutorialD sessionId dbconn "insert s relation{tuple{city \"Boston\", s# \"S6\", sname \"Stevens\", status 30}}"
393394 --insert an constraint-violating tuple
394− let expectedError = InclusionDependencyCheckError "sname_status_A"
395− expectTutorialDErr sessionId dbconn expectedError "insert s relation{tuple{city \"Boston\", s# \"S7\", sname \"Jones\", status 20}}"
395+ let expectedError = "InclusionDependencyCheckError \"sname_status_A\""
396+ expectTutorialDErr sessionId dbconn (T.isPrefixOf expectedError) "insert s relation{tuple{city \"Boston\", s# \"S7\", sname \"Jones\", status 20}}"
396397
test/TutorialD/Interpreter/DatabaseContextFunctionScript.hs−2
@@ -55,5 +55,3 @@ testDBCFunctionWithAtomArguments = TestCase $ do
5555adddatabasecontextfunction "addperson" Int -> Text -> DatabaseContext -> DatabaseContext """(\(age:name:_) ctx -> let newrel = MakeRelationFromExprs Nothing [TupleExpr (fromList [("name", name),("age",age))]] in if isRight (runState (executeRelationalExpr (RelationVariable "person" ()) ctx)) then execState (executeContextExpr (Insert "person" newrel)) ctx else execState (executeContextExpr (Assign "person" newrel)) ctx) :: [Atom] -> DatabaseContext -> DatabaseContext"""
5656-}
5757
58−f :: [Atom] -> DatabaseContext -> DatabaseContext
59−f = \(age:name:_) ctx -> let newrel = MakeRelationFromExprs Nothing [TupleExpr (fromList [("name", name),("age",age))]] in if isRight (runState (executeRelationalExpr (RelationVariable "person" ()))ctx) then execState (executeContextExpr (Insert "person" newrel)) ctx else execState (executeContextExpr (Assign "person" newrel)) ctx