git.iko.soy/Idris-dev
on master help sign in
got rid of the unwanted functions
commitb1efbabb239c44d22deba2e20b827b90323320c2 authormelissam <mfm6@st-andrews.ac.uk> dateMon 6 Aug 2012, 16:31 (14 years ago) parent554ac04
4 files changed+7−34
compare with master
unifiedsplit
contribs/lib/SQLite3/._sqlexpr.idr contribs/lib/SQLite3/._sqlite3.idr contribs/lib/SQLite3/sqlexpr.idr−27 contribs/lib/SQLite3/sqlite3.idr+7−7
contribs/lib/SQLite3/._sqlexpr.idr

Binary file not shown.

contribs/lib/SQLite3/._sqlite3.idr

Binary file not shown.

contribs/lib/SQLite3/sqlexpr.idr−27
@@ -52,28 +52,6 @@ unwords' ws = (foldr1 addSpace ws)
5252unwords : List String -> String
5353unwords = pack . unwords' . map unpack
5454
55−
56−mapping : Int -> List a -> List (Int, a)
57−mapping counter [] = []
58−mapping counter (x :: xs) = (counter, x) :: mapping (counter + 1) xs
59−
60−fromJust : Maybe Value -> Value
61−fromJust Nothing = VNULL
62−fromJust (Just x) = x
63−
64−popintoList : Maybe Value -> List (Maybe Value) -> List (Maybe Value)
65−popintoList (Just x) [] = [(Just x)]
66−popintoList (Just (x)) ((Just x) :: xs) = (popintoList (Just x) xs)
67−popintoList Nothing [] = []
68−
69−getlist : (String, List (Maybe(Int, Value))) -> List (Maybe(Int, Value))
70−getlist (x, (xs)) = xs
71−
72−
73−outList : List (Maybe Value) -> Maybe Value
74−outList [] = Nothing
75−outList ((Just x)::xs) = Just x
76−
7755valString : List (Maybe(Int, Value)) -> Value -> (String, List (Maybe(Int, Value)))
7856valString xs (VInt x) = ("?" ++ show (cast(length xs)+1), xs ++ [Just (cast((length xs)+1),(VInt x))])
7957valString xs (VStr x) = ("?" ++ show (cast(length xs)+1), xs ++ [Just (cast((length xs)+1),(VStr x))])
@@ -155,9 +133,4 @@ evalSQL xs (UPDATE sql cl) = let (tblname, newxs) = evalSQL xs sql in
155133 let (csstring, newxs') = condClauseStr newxs cl in
156134 ("UPDATE " ++ tblname ++ csstring, newxs')
157135
158−
159−
160−display : (String, List (Maybe(Int, Value))) -> String
161−display (x, (xs)) = x
162−
163136
contribs/lib/SQLite3/sqlite3.idr+7−7
@@ -359,8 +359,8 @@ bindMulti pointer ((Just (indexs, val))::vs) = case val of
359359testexpr : DB()
360360testexpr = do db <- open_db "somedb.db"
361361 let sql = (evalSQL [] ((SELECT ALL)(TBL "tbl1") (OR (AND (MkCond (Equals (VCol "data")(VStr "data0"))) (MkCond (Equals (VCol "num")(VInt 1))) ) (MkCond (Equals (VCol "num")(VInt 2))))))
362− let x = (display sql)
363− let list = (getlist sql)
362+ let x = (fst sql)
363+ let list = (snd sql)
364364 liftIO(print x)
365365 stmt <- (prepare_db db x)
366366 bindMulti stmt list
@@ -374,8 +374,8 @@ testexpr = do db <- open_db "somedb.db"
374374testupdate : DB()
375375testupdate = do db <- open_db "somedb.db"
376376 let sql = (evalSQL [] (UPDATE (TBL "tbl1") (WHERE (SET (MkCond (Equals(VCol "data") (VStr "data0"))) ) (MkCond (Equals (VCol "num") (VInt 2))) ) ))
377− let x = (display sql)
378− let list = (getlist sql)
377+ let x = (fst sql)
378+ let list = (snd sql)
379379 liftIO(print x)
380380 stmt <- (prepare_db db x)
381381 bindMulti stmt list
@@ -387,8 +387,8 @@ testupdate = do db <- open_db "somedb.db"
387387testInsert : DB()
388388testInsert = do db <- open_db "somedb.db"
389389 let sql = (evalSQL [] (INSERT (TBL "tbl1") [(VInt 2),(VStr "histring2")]))
390− let x = (display sql)
391− let list = (getlist sql)
390+ let x = (fst sql)
391+ let list = (snd sql)
392392 liftIO(print x)
393393 stmt <- (prepare_db db x)
394394 bindMulti stmt list
@@ -398,7 +398,7 @@ testInsert = do db <- open_db "somedb.db"
398398 return ()
399399main : IO ()
400400main = do --x <- runDB (test3)
401− y <- runDB (testInsert)
401+ y <- runDB (testexpr)
402402 return ()
403403
404404