on master help sign in
Minor style and readability updates
commiteee47314393de8592a54f0433d76879b9f3f9af4 authorDavid Christiansen <david@davidchristiansen.dk> dateWed 1 May 2013, 10:01 (13 years ago) parent8b7db47
1 file changed+157−152
contribs/lib/SQLite3/Sqlite3.idr+157−152
contribs/lib/SQLite3/Sqlite3.idr+157−152
@@ -22,7 +22,7 @@ data DBVal = DBInt Int
2222 | DBText String
2323 | DBFloat Float
2424 | DBNull
25−
25+
2626-- Database pointer
2727data DBPointer = MkDBPointer Ptr
2828-- Table pointer
@@ -42,19 +42,16 @@ data DB a = MkDB (IO (Either String a))
4242
4343instance Functor DB where
4444 fmap f (MkDB action) = MkDB (do res <- action
45− case res of
46− Left x => return (Left x)
47− Right x => return (Right (f x)))
45+ return (fmap f res))
46+
4847
4948instance Applicative DB where
5049 pure = MkDB . return . Right
51− (MkDB f) <$> (MkDB x) = MkDB (do f' <- f -- FIXME make pretty
50+ (MkDB f) <$> (MkDB x) = MkDB (do f' <- f
5251 case f' of
5352 Left err => return (Left err)
54− Right op => do x' <- x
55− case x' of
56− Left err => return (Left err)
57− Right v => return (Right (op v)))
53+ Right op => x >>= (return . fmap op))
54+
5855
5956instance Monad DB where
6057 (MkDB l) >>= k = MkDB (do c <- l
@@ -79,14 +76,14 @@ runDB : DB a -> IO a
7976runDB (MkDB f) = do f' <- f
8077 case f' of
8178 Right v => return v
82− Left str => ioError str
83−
79+ Left str => ioError str
80+
8481-----------------------------------------------------------------------------
8582-- | Opens an SQLite database file as specified by the String name argument.
8683-----------------------------------------------------------------------------
87−
84+
8885open_db : String -> DB DBPointer
89−open_db name = do x <- liftIO(mkForeign (FFun "sqlite3_open_idr" [FString] FPtr) name)
86+open_db name = do x <- liftIO (mkForeign (FFun "sqlite3_open_idr" [FString] FPtr) name)
9087 return (MkDBPointer x)
9188
9289-----------------------------------------------------------------------------
@@ -94,38 +91,38 @@ open_db name = do x <- liftIO(mkForeign (FFun "sqlite3_open_idr" [FString] FPtr)
9491-----------------------------------------------------------------------------
9592
9693close_db : DBPointer -> DB Int
97−close_db (MkDBPointer pointer) = liftIO (mkForeign (FFun "sqlite3_close_idr" [FPtr] FInt)pointer)
94+close_db (MkDBPointer pointer) = liftIO (mkForeign (FFun "sqlite3_close_idr" [FPtr] FInt) pointer)
9895
9996-----------------------------------------------------------------------------
10097-- | Wrapper around prepare, step and finalize.
10198-----------------------------------------------------------------------------
102−
99+
103100exec_db : DBPointer -> String -> DB Int
104−exec_db (MkDBPointer pointer) stmt = do
105− x <- liftIO(mkForeign (FFun "sqlite3_exec_idr" [FPtr, FString] FInt)pointer stmt)
101+exec_db (MkDBPointer pointer) stmt = do
102+ x <- liftIO (mkForeign (FFun "sqlite3_exec_idr" [FPtr, FString] FInt) pointer stmt)
106103 if (x == 1)
107− then fail "Could not execute."
108− else return x
104+ then fail "Could not execute."
105+ else return x
109106
110107-----------------------------------------------------------------------------
111108-- | Executes a prepared query. Use of this version is recommended.
112109-----------------------------------------------------------------------------
113110
114111exec_db_v2 : StmtPtr -> DB Int
115−exec_db_v2 (MkStmtPtr pointer) = do
112+exec_db_v2 (MkStmtPtr pointer) = do
116113 x <- liftIO (mkForeign (FFun "exec_db" [FPtr] FInt) pointer)
117114 if (x == 21)
118− then fail "No data returned."
119− else return x
120−
115+ then fail "No data returned."
116+ else return x
117+
121118-----------------------------------------------------------------------------
122119-- | Returns the error stored in the buffer by exec_db function.
123120-- This function can only be used with exec_db and get_table.
124121-- Only these functions store any occured error in the buffer array.
125122-----------------------------------------------------------------------------
126−
123+
127124get_error : DBPointer -> IO String
128−get_error (MkDBPointer pointer) =mkForeign (FFun "sqlite3_get_error" [FPtr] FString)pointer
125+get_error (MkDBPointer pointer) = mkForeign (FFun "sqlite3_get_error" [FPtr] FString) pointer
129126
130127
131128-----------------------------------------------------------------------------
@@ -133,14 +130,14 @@ get_error (MkDBPointer pointer) =mkForeign (FFun "sqlite3_get_error" [FPtr] FStr
133130-- Returns a pointer to a Statement pointer on a successful call.
134131-- Returns a null pointer on a failure.
135132-----------------------------------------------------------------------------
136−
133+
137134prepare_db : DBPointer -> String -> DB StmtPtr
138135prepare_db (MkDBPointer pointer) cmd = do
139− result <- liftIO(mkForeign (FFun "sqlite3_prepare_idr" [FPtr, FString] FPtr)pointer cmd)
140− flag <- liftIO(nullPtr result)
136+ result <- liftIO (mkForeign (FFun "sqlite3_prepare_idr" [FPtr, FString] FPtr) pointer cmd)
137+ flag <- liftIO (nullPtr result)
141138 if flag
142− then fail "Error occured while preparing"
143− else return (MkStmtPtr result)
139+ then fail "Error occured while preparing"
140+ else return (MkStmtPtr result)
144141
145142-----------------------------------------------------------------------------
146143-- | Returns the error stored in the buffer by exec_db function.
@@ -152,81 +149,92 @@ step_db : StmtPtr -> DB Int
152149step_db (MkStmtPtr pointer)= do
153150 x <- liftIO (mkForeign (FFun "sqlite3_step_idr" [FPtr] FInt)pointer)
154151 if ( x == 101)
155− then fail "SQLITE_DONE"
156− else return x
152+ then fail "SQLITE_DONE"
153+ else return x
157154
158155-----------------------------------------------------------------------------
159−-- | Deletes a prepared statement. This function must be called after
156+-- | Deletes a prepared statement. This function must be called after
160157-- prepare function.
161158-----------------------------------------------------------------------------
162159
163160finalize_db : StmtPtr -> DB Int
164−finalize_db (MkStmtPtr pointer) = do
165− x <- liftIO (mkForeign (FFun "sqlite3_finalize_idr" [FPtr] FInt)pointer)
161+finalize_db (MkStmtPtr pointer) = do
162+ x <- liftIO (mkForeign (FFun "sqlite3_finalize_idr" [FPtr] FInt) pointer)
166163 if (x /= 0)
167− then fail "Could not finalize"
168− else return x
164+ then fail "Could not finalize"
165+ else return x
169166
170167-----------------------------------------------------------------------------
171168-- | Resets a prepared statement pointer back to its initial state.
172169-----------------------------------------------------------------------------
173170
174171reset_db : StmtPtr -> DB Int
175−reset_db (MkStmtPtr pointer) = do
176− x <- liftIO(mkForeign (FFun "sqlite3_reset_idr" [FPtr] FInt)pointer)
177− if (x /=0)
178− then fail "Could not reset"
179− else return x
172+reset_db (MkStmtPtr pointer) = do
173+ x <- liftIO (mkForeign (FFun "sqlite3_reset_idr" [FPtr] FInt) pointer)
174+ if (x /= 0)
175+ then fail "Could not reset"
176+ else return x
180177
181178-----------------------------------------------------------------------------
182179-- | These routines obtain column information.
183180-----------------------------------------------------------------------------
184181
185182column_count : DBPointer -> IO (Either String Int)
186−column_count (MkDBPointer pointer) = do
187− x <- mkForeign (FFun "sqlite3_column_count_idr" [FPtr] FInt)pointer
188− if (x == 0 )
189− then return (Left "No Data")
190− else return (Right x)
183+column_count (MkDBPointer pointer) = do
184+ x <- mkForeign (FFun "sqlite3_column_count_idr" [FPtr] FInt) pointer
185+ return $ if (x == 0 )
186+ then Left "No Data"
187+ else (Right x)
191188
192189column_name : DBPointer -> Int -> IO String
193−column_name (MkDBPointer pointer) iCol =mkForeign (FFun "sqlite3_column_name_idr" [FPtr, FInt] FString)pointer iCol
194−
190+column_name (MkDBPointer pointer) iCol =
191+ mkForeign (FFun "sqlite3_column_name_idr" [FPtr, FInt] FString) pointer iCol
192+
195193column_decltype : DBPointer -> Int -> IO String
196−column_decltype (MkDBPointer pointer) iCol =mkForeign (FFun "sqlite3_column_decltype_idr" [FPtr, FInt] FString)pointer iCol
194+column_decltype (MkDBPointer pointer) iCol =
195+ mkForeign (FFun "sqlite3_column_decltype_idr" [FPtr, FInt] FString) pointer iCol
197196
198197
199198column_bytes : DBPointer -> Int -> IO Int
200−column_bytes (MkDBPointer pointer) iCol =mkForeign (FFun "sqlite3_column_bytes_idr" [FPtr, FInt] FInt)pointer iCol
199+column_bytes (MkDBPointer pointer) iCol =
200+ mkForeign (FFun "sqlite3_column_bytes_idr" [FPtr, FInt] FInt) pointer iCol
201201
202202
203203column_blob : DBPointer -> Int -> IO String
204−column_blob (MkDBPointer pointer) iCol =mkForeign (FFun "sqlite3_column_bytes_idr" [FPtr, FInt] FString)pointer iCol
204+column_blob (MkDBPointer pointer) iCol =
205+ mkForeign (FFun "sqlite3_column_bytes_idr" [FPtr, FInt] FString) pointer iCol
205206
206207
207208column_text : DBPointer -> Int -> IO String
208−column_text (MkDBPointer pointer) iCol =mkForeign (FFun "sqlite3_column_text_idr" [FPtr, FInt] FString)pointer iCol
209+column_text (MkDBPointer pointer) iCol =
210+ mkForeign (FFun "sqlite3_column_text_idr" [FPtr, FInt] FString) pointer iCol
209211
210212
211213column_Int : DBPointer -> Int -> IO Int
212−column_Int (MkDBPointer pointer) iCol =mkForeign (FFun "sqlite3_column_int_idr" [FPtr, FInt] FInt)pointer iCol
214+column_Int (MkDBPointer pointer) iCol =
215+ mkForeign (FFun "sqlite3_column_int_idr" [FPtr, FInt] FInt) pointer iCol
213216
214217-----------------------------------------------------------------------------
215218-- | These routines support some of SQLite backup functions.
216219-----------------------------------------------------------------------------
217220
218−backup_init : DBPointer -> String -> DBPointer -> String -> IO DBPointer
219−backup_init (MkDBPointer des_pointer) destName (MkDBPointer src_pointer) srcName = do x <- mkForeign (FFun "sqlite3_backup_init_idr" [FPtr,FString, FPtr, FString] FPtr)des_pointer destName src_pointer srcName
220− return (MkDBPointer x)
221+backup_init : DBPointer -> String -> DBPointer -> String -> IO DBPointer
222+backup_init (MkDBPointer des_pointer) destName (MkDBPointer src_pointer) srcName =
223+ do x <- mkForeign (FFun "sqlite3_backup_init_idr" [FPtr,FString, FPtr, FString] FPtr)
224+ des_pointer destName src_pointer srcName
225+ return (MkDBPointer x)
221226
222227backup_step : DBPointer -> Int -> IO Int
223−backup_step (MkDBPointer pointer) nPage =mkForeign (FFun "sqlite3_backup_step_idr" [FPtr, FInt] FInt)pointer nPage
228+backup_step (MkDBPointer pointer) nPage =
229+ mkForeign (FFun "sqlite3_backup_step_idr" [FPtr, FInt] FInt) pointer nPage
224230
225231backup_finish : DBPointer -> IO Int
226−backup_finish (MkDBPointer pointer) =mkForeign (FFun "sqlite3_backup_finish_idr" [FPtr] FInt)pointer
232+backup_finish (MkDBPointer pointer) =
233+ mkForeign (FFun "sqlite3_backup_finish_idr" [FPtr] FInt) pointer
227234
228235backup_remaining : DBPointer -> IO Int
229−backup_remaining (MkDBPointer pointer) =mkForeign (FFun "sqlite3_backup_remaining_idr" [FPtr] FInt)pointer
236+backup_remaining (MkDBPointer pointer) =
237+ mkForeign (FFun "sqlite3_backup_remaining_idr" [FPtr] FInt) pointer
230238
231239
232240-----------------------------------------------------------------------------
@@ -237,100 +245,98 @@ backup_remaining (MkDBPointer pointer) =mkForeign (FFun "sqlite3_backup_remainin
237245-----------------------------------------------------------------------------
238246
239247get_table : DBPointer -> String -> DB TBPointer
240−get_table (MkDBPointer pointer) name = do
241− x <- liftIO(mkForeign (FFun "sqlite3_get_table_idr" [FPtr, FString] FPtr)pointer name)
242− flag <- liftIO(nullPtr x)
248+get_table (MkDBPointer pointer) name = do
249+ x <- liftIO(mkForeign (FFun "sqlite3_get_table_idr" [FPtr, FString] FPtr) pointer name)
250+ flag <- liftIO (nullPtr x)
243251 if flag
244− then do x <- liftIO(get_error_table pointer) ; fail x
245− else return (MkTBPointer x)
252+ then do x <- liftIO(get_error_table pointer) ; fail x
253+ else return (MkTBPointer x)
246254 where
247255 get_error_table : Ptr-> IO String
248− get_error_table pointer = do x <- mkForeign (FFun "sqlite3_get_error" [FPtr] FString)pointer
256+ get_error_table pointer = do x <- mkForeign (FFun "sqlite3_get_error" [FPtr] FString) pointer
249257 return x
250258
251259
252260free_table : TBPointer -> IO ()
253−free_table (MkTBPointer pointer) = do x <- mkForeign (FFun "sqlite3_free_table_idr" [FPtr] FUnit)pointer
261+free_table (MkTBPointer pointer) = do x <- mkForeign (FFun "sqlite3_free_table_idr" [FPtr] FUnit) pointer
254262 return ()
255−
263+
256264-----------------------------------------------------------------------------
257265-- | This version of these function obtain the row and column number
258266-- from the Table struct. These functions are only used with get_table.
259267-----------------------------------------------------------------------------
260268
261269num_row : TBPointer -> IO Int
262−num_row (MkTBPointer pointer) = do x <- mkForeign (FFun "sqlite3_get_num_row" [FPtr] FInt)pointer
263− return (x)
270+num_row (MkTBPointer pointer) = do x <- mkForeign (FFun "sqlite3_get_num_row" [FPtr] FInt) pointer
271+ return x
264272
265273num_col : TBPointer -> IO Int
266−num_col (MkTBPointer pointer) = do x <- mkForeign (FFun "sqlite3_get_num_col" [FPtr] FInt)pointer
267− return (x)
268−
274+num_col (MkTBPointer pointer) = do x <- mkForeign (FFun "sqlite3_get_num_col" [FPtr] FInt) pointer
275+ return x
276+
269277-----------------------------------------------------------------------------
270278-- | This version of these function obtain the row and column number
271279-- from the Database struct.
272280-----------------------------------------------------------------------------
273281
274282num_row_v2 : DBPointer -> IO Int
275−num_row_v2 (MkDBPointer pointer) = do x <- mkForeign (FFun "sqlite3_get_num_row_v2" [FPtr] FInt)pointer
276− return (x)
283+num_row_v2 (MkDBPointer pointer) = do x <- mkForeign (FFun "sqlite3_get_num_row_v2" [FPtr] FInt) pointer
284+ return x
277285
278286num_col_v2 : DBPointer -> IO Int
279−num_col_v2 (MkDBPointer pointer) = do x <- mkForeign (FFun "sqlite3_get_num_col_v2" [FPtr] FInt)pointer
280− return (x)
281−
287+num_col_v2 (MkDBPointer pointer) = do x <- mkForeign (FFun "sqlite3_get_num_col_v2" [FPtr] FInt) pointer
288+ return x
289+
282290-----------------------------------------------------------------------------
283291-- | This function prints the result of a query by checking the type
284292-- of each value returned, it then calls the appropriate function.
285293-- Ther result is one of the DBVal variants.
286294-----------------------------------------------------------------------------
287−
295+
288296get_data : DBPointer -> Int -> Int -> IO DBVal
289297get_data (MkDBPointer pointer) row col = do
290298 ty <- get_data_type pointer row col
291299 helper ty
292− where
293− get_data_type : Ptr ->Int -> Int -> IO Int
294− get_data_type pointer row col =mkForeign (FFun "sqlite3_get_data_type" [FPtr, FInt, FInt] FInt)pointer row col
295−
296− get_data_val_int : Ptr -> Int -> IO Int
297− get_data_val_int pointer col =mkForeign (FFun "sqlite3_get_val_int" [FPtr,FInt] FInt)pointer col
298−
299− get_data_val_text : Ptr -> Int -> IO String
300− get_data_val_text pointer col =mkForeign (FFun "sqlite3_get_val_text" [FPtr, FInt] FString)pointer col
301−
302−
303−
304− get_data_val_float : Ptr -> Int -> IO Float
305− get_data_val_float pointer col =mkForeign (FFun "sqlite3_get_float" [FPtr, FInt] FFloat)pointer col
306−
307− helper : Int -> IO DBVal
308− helper 1 = do i <- get_data_val_int pointer col ; return (DBInt i)
309− helper 2 = do i <- get_data_val_float pointer col ; return (DBFloat i)
310− helper 3 = do i <- get_data_val_text pointer col; return (DBText i)
311− helper _ =return (DBNull)
312−
300+ where get_data_type : Ptr ->Int -> Int -> IO Int
301+ get_data_type pointer row col =
302+ mkForeign (FFun "sqlite3_get_data_type" [FPtr, FInt, FInt] FInt) pointer row col
303+ get_data_val_int : Ptr -> Int -> IO Int
304+ get_data_val_int pointer col =
305+ mkForeign (FFun "sqlite3_get_val_int" [FPtr,FInt] FInt) pointer col
306+
307+ get_data_val_text : Ptr -> Int -> IO String
308+ get_data_val_text pointer col =
309+ mkForeign (FFun "sqlite3_get_val_text" [FPtr, FInt] FString) pointer col
310+
311+ get_data_val_float : Ptr -> Int -> IO Float
312+ get_data_val_float pointer col =
313+ mkForeign (FFun "sqlite3_get_float" [FPtr, FInt] FFloat) pointer col
314+
315+ helper : Int -> IO DBVal
316+ helper 1 = do i <- get_data_val_int pointer col ; return (DBInt i)
317+ helper 2 = do i <- get_data_val_float pointer col ; return (DBFloat i)
318+ helper 3 = do i <- get_data_val_text pointer col; return (DBText i)
319+ helper _ = return DBNull
320+
313321-----------------------------------------------------------------------------
314322-- | This function makes use of get_data to get all the result.
315323-----------------------------------------------------------------------------
316324
317−toList_v1 : DBPointer -> DB Table
325+toList_v1 : DBPointer -> DB Table
318326toList_v1 db = do nbR <- liftIO (num_row_v2 db)
319327 nmC <- liftIO (num_col_v2 db)
320−
321− res <- liftIO $ forM [0..(nbR-1)] (\ i =>
322− forM [0..(nmC-1)] (\ j => get_data db i j)
323− )
328+ res <- liftIO $ forM [0..(nbR-1)] $ \ i =>
329+ forM [0..(nmC-1)] $ \ j => get_data db i j
324330 return (the (List (List DBVal)) res)
325331
326332strcat : String -> String-> String
327−strcat str1 str2 = (str1 ++ str2)
333+strcat str1 str2 = str1 ++ str2
328334
329335-----------------------------------------------------------------------------
330336-- | This version of toList retunrs result from get_table
331337-- This could be removed if not needed in the future.
332338-----------------------------------------------------------------------------
333−
339+
334340--toList_v2 : String -> String -> DBPointer -> DB Table
335341--toList_v2 name stmt x = do
336342-- ptr <- (get_table x (stmt))
@@ -339,12 +345,12 @@ strcat str1 str2 = (str1 ++ str2)
339345-- res <- forM [0..(nbR-1)] (\ i =>
340346-- forM [0..(nmC-1)] (\ j =>
341347-- liftIO(get_data x name i j)
342−--
348+--
343349-- )
344350-- )
345351-- liftIO (free_table ptr)
346−-- return res
347−
352+-- return res
353+
348354
349355-----------------------------------------------------------------------------
350356-- | These routines support binding the types supported by Idris.
@@ -353,68 +359,67 @@ strcat str1 str2 = (str1 ++ str2)
353359-----------------------------------------------------------------------------
354360
355361bind_int : StmtPtr -> Int -> Int -> DB StmtPtr
356−bind_int (MkStmtPtr pointer) indexval val = do
357− x <- liftIO(mkForeign (FFun "sqlite3_bind_int_idr" [FPtr, FInt, FInt] FPtr)pointer indexval val)
358− flag <- liftIO(nullPtr x)
362+bind_int (MkStmtPtr pointer) indexval val = do
363+ x <- liftIO (mkForeign (FFun "sqlite3_bind_int_idr" [FPtr, FInt, FInt] FPtr) pointer indexval val)
364+ flag <- liftIO (nullPtr x)
359365 if flag
360− then fail "Could not bind int."
361− else return (MkStmtPtr x)
362−
363−
366+ then fail "Could not bind int."
367+ else return (MkStmtPtr x)
368+
369+
364370bind_float : StmtPtr -> Int -> Float -> DB StmtPtr
365−bind_float (MkStmtPtr pointer) indexval val = do
366− x <- liftIO(mkForeign (FFun "sqlite3_bind_float_idr" [FPtr, FInt, FFloat] FPtr)pointer indexval val)
367− flag <- liftIO(nullPtr x)
371+bind_float (MkStmtPtr pointer) indexval val = do
372+ x <- liftIO (mkForeign (FFun "sqlite3_bind_float_idr" [FPtr, FInt, FFloat] FPtr) pointer indexval val)
373+ flag <- liftIO (nullPtr x)
368374 if flag
369− then fail "Could not bind float."
370− else return (MkStmtPtr x)
375+ then fail "Could not bind float."
376+ else return (MkStmtPtr x)
371377
372378bind_text : StmtPtr -> String -> Int -> Int -> DB StmtPtr
373379bind_text (MkStmtPtr pointer) text indexval lengthval = do
374− x <- liftIO(mkForeign (FFun "sqlite3_bind_text_idr" [FPtr, FString, FInt, FInt] FPtr)pointer text indexval lengthval)
375− flag <- liftIO(nullPtr x)
380+ x <- liftIO (mkForeign (FFun "sqlite3_bind_text_idr" [FPtr, FString, FInt, FInt] FPtr)
381+ pointer text indexval lengthval)
382+ flag <- liftIO(nullPtr x)
376383 if flag
377− then fail "Could not bind text."
378− else return (MkStmtPtr x)
384+ then fail "Could not bind text."
385+ else return (MkStmtPtr x)
379386
380387bind_null : StmtPtr -> Int -> DB StmtPtr
381−bind_null (MkStmtPtr pointer) indexval = do
382− x <- liftIO(mkForeign (FFun "sqlite3_bind_null_idr" [FPtr, FInt] FPtr)pointer indexval)
383− flag <- liftIO(nullPtr x)
388+bind_null (MkStmtPtr pointer) indexval = do
389+ x <- liftIO (mkForeign (FFun "sqlite3_bind_null_idr" [FPtr, FInt] FPtr) pointer indexval)
390+ flag <- liftIO (nullPtr x)
384391 if flag
385− then fail "Could not bind null."
386− else return (MkStmtPtr x)
392+ then fail "Could not bind null."
393+ else return (MkStmtPtr x)
387394
388395-----------------------------------------------------------------------------
389396-- | String Length
390397-----------------------------------------------------------------------------
391−
398+
392399strlen : String -> DB Int
393−strlen str = liftIO(mkForeign (FFun "strLength" [FString] FInt) str)
394−
400+strlen str = liftIO (mkForeign (FFun "strLength" [FString] FInt) str)
401+
395402instance Show DBVal where
396− show (DBInt i) = "Int val: " ++ show i ++ "\n"
397− show (DBText i) = "Text val: " ++ show i ++ "\n"
398− show (DBFloat i) = "Float val: " ++ show i ++ "\n"
399− show (DBNull ) = "NULL"
403+ show (DBInt i) = "Int val: " ++ show i ++ "\n"
404+ show (DBText i) = "Text val: " ++ show i ++ "\n"
405+ show (DBFloat i) = "Float val: " ++ show i ++ "\n"
406+ show (DBNull ) = "NULL"
400407
401408-----------------------------------------------------------------------------
402409-- | Multi bind a list of values.
403410-----------------------------------------------------------------------------
404411
405412bindMulti : StmtPtr-> List (Maybe (Int, Value)) -> DB StmtPtr
406−bindMulti pointer [] = return pointer
407−bindMulti pointer (Nothing :: vs) = bindMulti pointer vs
408−bindMulti pointer ((Just (indexs, val))::vs) = case val of
409− (VInt intval) => do x <- bind_int pointer indexs intval
410− bindMulti(x) vs
411−
412− (VStr strval) => do len <- strlen strval
413− x <- bind_text pointer strval indexs len
414− bindMulti(x) vs
415−
416−
417− (VFloat floatval) => do x <- bind_float pointer indexs floatval
418−
419− bindMulti(x) vs
413+bindMulti pointer [] = return pointer
414+bindMulti pointer (Nothing :: vs) = bindMulti pointer vs
415+bindMulti pointer ((Just (indexs, (VInt i)))::vs) =
416+ do x <- bind_int pointer indexs i
417+ bindMulti x vs
418+bindMulti pointer ((Just (indexs, (VStr s)))::vs) =
419+ do len <- strlen s
420+ x <- bind_text pointer s indexs len
421+ bindMulti x vs
422+bindMulti pointer ((Just (indexs, (VFloat f)))::vs) =
423+ do x <- bind_float pointer indexs f
424+ bindMulti x vs
420425