git.iko.soy/Idris-dev
on master help sign in
using gc.h
commit7708af2db5a47668d861714c2488d0b87535b03e authormelissam <mfm6@st-andrews.ac.uk> dateWed 18 Jul 2012, 13:31 (14 years ago) parent35259d2
2 files changed+21−19
compare with master
unifiedsplit
contribs/lib/SQLite3/sqlite3.idr+8−7 contribs/lib/SQLite3/sqlite3api.c+13−12
contribs/lib/SQLite3/sqlite3.idr+8−7
@@ -211,6 +211,7 @@ toList name stmt x = do
211211 res <- forM [0..(nbR-1)] (\ i =>
212212 forM [0..(nmC-1)] (\ j =>
213213 liftIO(get_data x name i j)
214+
214215 )
215216 )
216217 liftIO (free_table ptr)
@@ -248,9 +249,9 @@ bind_null (MkStmtPtr pointer) indexval =do
248249
249250
250251instance Show DBVal where
251− show (DBInt i) = "Int val: " ++ show i
252− show (DBText i) = "Text val: " ++ show i
253− show (DBFloat i) = "Float val: " ++ show i
252+ show (DBInt i) = "Int val: " ++ show i ++ "\n"
253+ show (DBText i) = "Text val: " ++ show i ++ "\n"
254+ show (DBFloat i) = "Float val: " ++ show i ++ "\n"
254255 show (DBNull ) = "NULL"
255256
256257print_data_v2 : DBVal -> String
@@ -269,10 +270,10 @@ test = do db <- liftIO (open_db "somedb.db")
269270
270271test2 : DB ()
271272test2 = do db <- liftIO (open_db "students.db")
272− -- tbl <- (get_table db "SELECT Student.Name FROM Student, Module, Enrollment WHERE Module.Credits = 30 AND Student.School_student = Enrollment.School_Student AND Student.School = Enrollment.School AND Enrollment.Code = Module.Code")
273− --res <- (toList "Student" "select *from Student;" db)
274− mydata <- liftIO ( get_data db "Student" 1 1)
275− liftIO(print mydata)
273+ tbl <- (get_table db "SELECT Student.Name FROM Student, Module, Enrollment WHERE Module.Credits = 30 AND Student.School_student = Enrollment.School_Student AND Student.School = Enrollment.School AND Enrollment.Code = Module.Code")
274+ res <- (toList "Student" "select *from Student;" db)
275+ --mydata <- liftIO ( get_data db "Student" 1 1)
276+ liftIO(print res)
276277 c <- liftIO (close_db db)
277278 return ()
278279
contribs/lib/SQLite3/sqlite3api.c+13−12
@@ -116,13 +116,13 @@ void* sqlite3_get_table_idr(void* db,
116116 row = tbl->num_row;
117117 col = tbl->num_col;
118118
119− for( i=0; i< row; i++){
120− for(j=0;j<col; j++){
121− printf("%s\n", tbl->table_data[(i+1)*col +j]);
122−
123− }
124−
125− }
119+// for( i=0; i< row; i++){
120+// for(j=0;j<col; j++){
121+// printf("%s\n", tbl->table_data[(i+1)*col +j]);
122+//
123+// }
124+//
125+// }
126126 return tbl;
127127
128128}
@@ -171,7 +171,7 @@ int sqlite3_get_data_type(void* p,const char* tbl_name, int nRow, int nCol){
171171 }
172172
173173 val =sqlite3_column_type(stmt, nCol);
174− printf("Type : %d\n", val );
174+ //printf("Type : %d\n", val );
175175
176176 rc =sqlite3_finalize(stmt);
177177 if( rc != SQLITE_OK){
@@ -210,7 +210,6 @@ int sqlite3_get_val_int(void* p,const char* tbl_name, int nRow, int nCol){
210210 }
211211
212212 val =sqlite3_column_int(stmt, nCol);
213− printf("int_val : %d\n", val );
214213 rc =sqlite3_finalize(stmt);
215214 if( rc != SQLITE_OK){
216215 printf("Couldnt finalize:\n");
@@ -248,10 +247,11 @@ const unsigned char* sqlite3_get_val_text(void* p,const char* tbl_name,int nRow,
248247
249248 }
250249
251− array =(unsigned char *) malloc(1000*sizeof(char));
250+ for ( i=0; i< 100000000; i++){
251+ array =(unsigned char *) GC_malloc(1000*sizeof(char));
252+ }
252253 text_val =sqlite3_column_text(stmt, nCol);
253254 memcpy(array, text_val, sizeof(text_val));
254− printf("text_val : %s\n", text_val );
255255 rc =sqlite3_finalize(stmt);
256256 if( rc != SQLITE_OK){
257257 printf("Couldn't finalize.\n");
@@ -261,6 +261,7 @@ const unsigned char* sqlite3_get_val_text(void* p,const char* tbl_name,int nRow,
261261
262262}
263263
264+
264265float sqlite3_get_float(void* p,const char* tbl_name, int nRow, int nCol){
265266
266267 DBinfo* dbi =(DBinfo*) p;
@@ -290,7 +291,7 @@ float sqlite3_get_float(void* p,const char* tbl_name, int nRow, int nCol){
290291 }
291292 double_val =sqlite3_column_double(stmt, nCol);
292293 float float_val =(float)double_val;
293− printf("float_val %f\n", float_val);
294+ //printf("float_val %f\n", float_val);
294295 rc =sqlite3_finalize(stmt);
295296 if( rc != SQLITE_OK){
296297 printf("Couldn't finalize.\n");