b1efbab · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

got rid of the unwanted functions

b1efbabmelissam14 years ago

contribs/lib/SQLite3/._sqlexpr.idr

compare with master

unifiedsplit

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)

52unwords : List String -> String

53unwords = pack . unwords' . map unpack

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−

77valString : List (Maybe(Int, Value)) -> Value -> (String, List (Maybe(Int, Value)))

55valString : List (Maybe(Int, Value)) -> Value -> (String, List (Maybe(Int, Value)))

78valString xs (VInt x) = ("?" ++ show (cast(length xs)+1), xs ++ [Just (cast((length xs)+1),(VInt x))])

56valString xs (VInt x) = ("?" ++ show (cast(length xs)+1), xs ++ [Just (cast((length xs)+1),(VInt x))])

79valString xs (VStr x) = ("?" ++ show (cast(length xs)+1), xs ++ [Just (cast((length xs)+1),(VStr x))])

57valString 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

155 let (csstring, newxs') = condClauseStr newxs cl in

133 let (csstring, newxs') = condClauseStr newxs cl in

156 ("UPDATE " ++ tblname ++ csstring, newxs')

134 ("UPDATE " ++ tblname ++ csstring, newxs')

157

135

158−

159−

160−display : (String, List (Maybe(Int, Value))) -> String

161−display (x, (xs)) = x

162−

163

136

contribs/lib/SQLite3/sqlite3.idr+7−7

@@ -359,8 +359,8 @@ bindMulti pointer ((Just (indexs, val))::vs) = case val of

359testexpr : DB()

360testexpr = do db <- open_db "somedb.db"

361 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)

362+ let x = (fst sql)

363− let list = (getlist sql)

363+ let list = (snd sql)

364 liftIO(print x)

365 stmt <- (prepare_db db x)

366 bindMulti stmt list

@@ -374,8 +374,8 @@ testexpr = do db <- open_db "somedb.db"

374testupdate : DB()

375testupdate = do db <- open_db "somedb.db"

376 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)

377+ let x = (fst sql)

378− let list = (getlist sql)

378+ let list = (snd sql)

379 liftIO(print x)

380 stmt <- (prepare_db db x)

381 bindMulti stmt list

@@ -387,8 +387,8 @@ testupdate = do db <- open_db "somedb.db"

387testInsert : DB()

388testInsert = do db <- open_db "somedb.db"

389 let sql = (evalSQL [] (INSERT (TBL "tbl1") [(VInt 2),(VStr "histring2")]))

390− let x = (display sql)

390+ let x = (fst sql)

391− let list = (getlist sql)

391+ let list = (snd sql)

392 liftIO(print x)

393 stmt <- (prepare_db db x)

394 bindMulti stmt list

@@ -398,7 +398,7 @@ testInsert = do db <- open_db "somedb.db"

398 return ()

399main : IO ()

400main = do --x <- runDB (test3)

401− y <- runDB (testInsert)

401+ y <- runDB (testexpr)

402 return ()

403

404