Commit 81b23516 authored by Michael Hanus 's avatar Michael Hanus

SQL tests re-activated

parent 39cc52a4
......@@ -13,7 +13,7 @@ queryS1 :: IO (SQLResult [Student])
queryS1 = ``sql Select * From Student;''
allStudents :: IO [Student]
allStudents = liftIO fromSQLResult ``sql Select * From Student;''
allStudents = fmap fromSQLResult ``sql Select * From Student;''
testS1 :: PropIO
testS1 = queryS1 `returns` Right
......@@ -31,7 +31,7 @@ testS2 = do
printResult result
queryS3 :: IO [String]
queryS3 = liftIO fromSQLResult
queryS3 = fmap fromSQLResult
``sql Select Distinct s.Name From Student as s;''
testS3 :: PropIO
......
......@@ -16,13 +16,10 @@ fi
ERD2CURRY=$HOME/.cpm/bin/erd2curry
if [ ! -x "$ERD2CURRY" ] ; then
ERD2CURRY=$CURRYBINDIR/$CURRYEXEC-erd2curry
if [ ! -x "$ERD2CURRY" ] ; then
echo "SQL integration not tested: no executable 'erd2curry' found!"
echo "To run the SQL integration test, install 'erd2curry' by:"
echo "> cypm install ertools"
exit
fi
echo "SQL integration not tested: no executable 'erd2curry' found!"
echo "To run the SQL integration test, install 'erd2curry' by:"
echo "> cypm install ertools"
exit
fi
ALLTESTS="test*.curry"
......@@ -51,7 +48,7 @@ exectests() {
# fill database:
$CURRYBINDIR/curry $REPL_OPTS :l CreateData :eval main :q
# run query tests:
$CURRYBINDIR/curry check SelectExamples
curry-check SelectExamples
}
LOGFILE=xxx$$
......
......@@ -48,6 +48,10 @@
{ "src-dir": "examples/IntegratedCode",
"modules": [ "testFormat", "testHtml", "testRegExps" ]
},
{ "src-dir": "examples/IntegratedSQLCode",
"options": "-v",
"script" : "test.sh"
},
{ "src-dir": "examples/DefaultRules",
"options": "-m40",
"modules": [ "BreakWhere", "BubbleSort", "ColorMap", "DutchFlag",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment