Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | implemented finalize! on sqlite3, fixed bind! bug with inexact integers |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
150009ee9beb4cd3a394c1ffeb94fc25 |
| User & Date: | aldo 2016-10-26 16:03:44 |
Context
|
2016-10-26
| ||
| 16:08 | fixed include issue with cut check-in: 31d22b4672 user: aldo tags: trunk | |
| 16:03 | implemented finalize! on sqlite3, fixed bind! bug with inexact integers check-in: 150009ee9b user: aldo tags: trunk | |
|
2016-09-12
| ||
| 17:31 | added some keyboard functions check-in: 3c717fb0e5 user: aldo tags: trunk | |
Changes
Changes to sqlite3.sls.
53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 ... 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 ... 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 ... 497 498 499 500 501 502 503 504 505 506 507 508 509 510 ... 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 |
(srfi s2 and-let) (matchable) (only (srfi s13 strings) string-contains-ci) (srfi s11 let-values) (srfi s26 cut) (sql-null)) (define library-init (begin (load-shared-object "libsqlite3.so.0"))) ;; compatibility functions (define (hashtable-walk ht f) (vector-for-each (lambda (x) (f x (hashtable-ref ht x #f))) (hashtable-keys ht))) (define (->string x) ................................................................................ (define (sqlite3-next-stmt db) (check-database 'sqlite3-next-stmt db) (let* ([f (foreign-procedure "sqlite3_next_stmt" (sqlite3:database*) sqlite3:statement*)] [stmt* (f (database-addr db))]) (make-statement (make-ftype-pointer sqlite3:statement* stmt*) db))) (define (finalize! x) (warning 'finalize! "not implemented!")) ;; #;(define finalize! ;; (match-lambda* ;; [((? database? db) . finalize-statements?) ;; (cond ;; [(not (database-ptr db)) ;; (void)] ;; [(let loop ([stmt ;; (and ................................................................................ (cond [((foreign-procedure "sqlite3_bind_int" (sqlite3:statement* int int) int) (statement-addr stmt) (fx+ i 1) v) => (abort-sqlite3-error 'bind! (statement-database stmt) stmt i v)]))] [(real? v) (cond [((foreign-procedure "sqlite3_bind_double" (sqlite3:statement* int double) int) (statement-addr stmt) (fx+ i 1) v) => (abort-sqlite3-error 'bind! (statement-database stmt) stmt i v)])] [(string? v) (let ([f (foreign-procedure "sqlite3_bind_text" (sqlite3:statement* int u8* int void*) int)] [s (string->utf8 v)]) (cond [(f (statement-addr stmt) (fx+ i 1) s (bytevector-length s) SQLITE_TRANSIENT) => (abort-sqlite3-error 'bind! (statement-database stmt) stmt i v)]))] ................................................................................ (define (column-name stmt i) (check-statement 'column-name stmt) ((foreign-procedure "sqlite3_column_name" (sqlite3:statement* int) string) (statement-addr stmt) i)) (define sqlite3_column_double (foreign-procedure "sqlite3_column_double" (sqlite3:statement* int) double)) (define sqlite3_column_boolean (foreign-procedure "sqlite3_column_int" (sqlite3:statement* int) boolean)) (define (sqlite3-column-bytes stmt i) ((foreign-procedure "sqlite3_column_bytes" (sqlite3:statement* int) int) (statement-addr stmt) i)) ................................................................................ ;; Retrieve data from a stepped statement (define (column-data stmt i) (case (column-type stmt i) [(integer) (if (and-let* ([type (column-declared-type stmt i)]) (string-contains-ci type "bool")) (sqlite3_column_boolean (statement-addr stmt) i) (sqlite3_column_double (statement-addr stmt) i))] [(float) (sqlite3_column_double (statement-addr stmt) i)] [(text) (sqlite3-column-text stmt i)] [(blob) (sqlite3-column-blob stmt i)] [else |
| > > > > | < > > > > | < > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > | |
53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 ... 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 ... 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 ... 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 ... 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 |
(srfi s2 and-let) (matchable) (only (srfi s13 strings) string-contains-ci) (srfi s11 let-values) (srfi s26 cut) (sql-null)) #;(define (sqlite3-library-init) (begin (case (machine-type) [(i3nt a6nt i3mw a6mw) (load-shared-object "sqlite3.dll")] [else (load-shared-object "libsqlite3.so.0")]))) (define libinit (begin (load-shared-object "sqlite3.dll"))) ;; compatibility functions (define (hashtable-walk ht f) (vector-for-each (lambda (x) (f x (hashtable-ref ht x #f))) (hashtable-keys ht))) (define (->string x) ................................................................................ (define (sqlite3-next-stmt db) (check-database 'sqlite3-next-stmt db) (let* ([f (foreign-procedure "sqlite3_next_stmt" (sqlite3:database*) sqlite3:statement*)] [stmt* (f (database-addr db))]) (make-statement (make-ftype-pointer sqlite3:statement* stmt*) db))) (define finalize! (case-lambda [(x) (finalize! x #f)] [(x finalize-statements?) (define sqlite3_finalize (foreign-procedure "sqlite3_finalize" (sqlite3:statement*) int)) (cond [(database? x) (cond [(not (database-ptr x)) (void)] [(let loop ([stmt (and finalize-statements? (sqlite3-next-stmt x))]) (if stmt (or (sqlite3_finalize (statement-addr x)) (loop (sqlite3-next-stmt (statement-database x)))) (let ([f (foreign-procedure "sqlite3_close" (sqlite3:database*) int)]) (f (database-addr x))))) => (abort-sqlite3-error 'finalize! x x)])] [(statement? x) (cond [(not (statement-ptr x)) (void)] [ (sqlite3_finalize (statement-addr x)) => (abort-sqlite3-error 'finalize! (statement-database x) x)] [else (statement-ptr-set! x #f)])] [else (errorf 'finalize! "database or statement ~d" x)])])) ;; #;(define finalize! ;; (match-lambda* ;; [((? database? db) . finalize-statements?) ;; (cond ;; [(not (database-ptr db)) ;; (void)] ;; [(let loop ([stmt ;; (and ................................................................................ (cond [((foreign-procedure "sqlite3_bind_int" (sqlite3:statement* int int) int) (statement-addr stmt) (fx+ i 1) v) => (abort-sqlite3-error 'bind! (statement-database stmt) stmt i v)]))] [(real? v) (cond [((foreign-procedure "sqlite3_bind_double" (sqlite3:statement* int double) int) (statement-addr stmt) (fx+ i 1) (exact->inexact v)) => (abort-sqlite3-error 'bind! (statement-database stmt) stmt i v)])] [(string? v) (let ([f (foreign-procedure "sqlite3_bind_text" (sqlite3:statement* int u8* int void*) int)] [s (string->utf8 v)]) (cond [(f (statement-addr stmt) (fx+ i 1) s (bytevector-length s) SQLITE_TRANSIENT) => (abort-sqlite3-error 'bind! (statement-database stmt) stmt i v)]))] ................................................................................ (define (column-name stmt i) (check-statement 'column-name stmt) ((foreign-procedure "sqlite3_column_name" (sqlite3:statement* int) string) (statement-addr stmt) i)) (define sqlite3_column_double (foreign-procedure "sqlite3_column_double" (sqlite3:statement* int) double)) (define sqlite3_column_int64 (foreign-procedure "sqlite3_column_int64" (sqlite3:statement* int) integer-64)) (define sqlite3_column_boolean (foreign-procedure "sqlite3_column_int" (sqlite3:statement* int) boolean)) (define (sqlite3-column-bytes stmt i) ((foreign-procedure "sqlite3_column_bytes" (sqlite3:statement* int) int) (statement-addr stmt) i)) ................................................................................ ;; Retrieve data from a stepped statement (define (column-data stmt i) (case (column-type stmt i) [(integer) (if (and-let* ([type (column-declared-type stmt i)]) (string-contains-ci type "bool")) (sqlite3_column_boolean (statement-addr stmt) i) (sqlite3_column_int64 (statement-addr stmt) i))] [(float) (sqlite3_column_double (statement-addr stmt) i)] [(text) (sqlite3-column-text stmt i)] [(blob) (sqlite3-column-blob stmt i)] [else |