04735e8 · project-m36 · git.iko.soy

src/bin/TutorialD/Interpreter/SchemaOperator.hs+3−3

@@ -42,7 +42,7 @@ isoRestrictP = do

42 reserved "isorestrict"

43 relVarIn <- qrelVarP

44 relvarsOut <- isoRestrictOutRelVarsP

45− IsoRestrict <$> pure relVarIn <*> restrictionPredicateP <*> pure relvarsOut

45+ IsoRestrict relVarIn <$> restrictionPredicateP <*> pure relvarsOut

46

47isoRestrictOutRelVarsP :: Parser (RelVarName, RelVarName)

48isoRestrictOutRelVarsP = (,) <$> qrelVarP <*> qrelVarP

@@ -55,7 +55,7 @@ isoUnionP = do

55 reserved "isounion"

56 relVarsIn <- isoUnionInRelVarsP

57 relVarsOut <- qrelVarP

58− IsoUnion <$> pure relVarsIn <*> restrictionPredicateP <*> pure relVarsOut

58+ IsoUnion relVarsIn <$> restrictionPredicateP <*> pure relVarsOut

59

60isoRenameP :: Parser SchemaIsomorph

61isoRenameP = do

@@ -74,4 +74,4 @@ isoUnionInRelVarsP = (,) <$> qrelVarP <*> qrelVarP

74evalSchemaOperator :: SessionId -> Connection -> SchemaOperator -> IO (Either RelationalError ())

75evalSchemaOperator sessionId conn (ModifySchemaExpr expr) = executeSchemaExpr sessionId conn expr

76evalSchemaOperator sessionId conn (SetCurrentSchema sname) = setCurrentSchemaName sessionId conn sname

77−

77+

src/lib/ProjectM36/Client.hs+1−2

@@ -1165,8 +1165,7 @@ executeDataFrameExpr sessionId conn@(InProcessConnection _) dfExpr = do

1165 Left err -> pure (Left err)

1166 Right attrs -> do

1167 let attrOrders = zipWith

1168− (\attr' order'

1169− -> DF.AttributeOrder (attributeName attr') order')

1168+ (DF.AttributeOrder . attributeName)

1170 attrs

1169 attrs

1171 orders

1170 orders

1172 case DF.sortDataFrameBy attrOrders . DF.toDataFrame $ rel of

1171 case DF.sortDataFrameBy attrOrders . DF.toDataFrame $ rel of

test/Relation/Tupleable.hs+1−1

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

1−{-# LANGUAGE DeriveGeneric, FlexibleInstances, FlexibleContexts, TypeOperators, DeriveAnyClass #-}

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

2import Test.HUnit

3import ProjectM36.Tupleable

4import ProjectM36.Atomable