Changeset 9304 in project


Ignore:
Timestamp:
03/08/08 04:34:41 (12 years ago)
Author:
Jim Ursetto
Message:

sqlite3: Restore error reporting. abort enum had overridden abort proc.

Location:
release/3/sqlite3/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • release/3/sqlite3/trunk/doc.scm

    r9153 r9304  
    260260
    261261    (history
     262      (version "2.0.7" "Restore error reporting. [Jim Ursetto]")
    262263      (version "2.0.6" "Add " (tt "enable-shared-cache!") ", requires 3.3.0 or later. [Jim Ursetto]")
    263264      (version "2.0.5" "Added some <boolean> support. Change for NULL (<void>) handling. [Kon Lovett]")
  • release/3/sqlite3/trunk/sqlite3.html

    r9153 r9304  
    455455<h3>Version</h3>
    456456<ul>
     457<li>2.0.7 Restore error reporting. [Jim Ursetto]</li>
    457458<li>2.0.6 Add <tt>enable-shared-cache!</tt>, requires 3.3.0 or later. [Jim Ursetto]</li>
    458459<li>2.0.5 Added some &lt;boolean&gt; support. Change for NULL (&lt;void&gt;) handling. [Kon Lovett]</li>
  • release/3/sqlite3/trunk/sqlite3.scm

    r9153 r9304  
    8282(define-macro thunker cut)
    8383
     84(define core:abort abort)   ; abort overridden by sqlite3:status enum
     85
    8486;;; Foreign types & values
    8587
     
    182184
    183185;; Errors
    184 
    185186(define ((abort-sqlite3-error loc db . args) sta)
    186   (abort
    187    (apply make-sqlite3-error-condition loc
    188                                        (if db (sqlite3:errmsg db) (symbol->string sta))
    189                                        sta
    190                                        args)) )
     187  (core:abort
     188   (apply make-sqlite3-error-condition
     189          loc
     190          (if db (sqlite3:errmsg db) (symbol->string sta))
     191          sta
     192          args)))
    191193
    192194(define (check-sqlite3-type loc obj class)
    193195  (unless (instance-of? obj class)
    194     (abort
     196    (core:abort
    195197     (make-composite-condition
    196198      (make-exn-condition loc
     
    203205
    204206(define (abort-sqlite3-null-error loc obj)
    205   (abort
     207  (core:abort
    206208   (make-sqlite3-error-condition loc
    207209                                 (string-append
     
    744746                 (sqlite3:bind! stmt i v) ) )
    745747           (iota cnt) params) )
    746         (abort
     748        (core:abort
    747749         (make-composite-condition
    748750          (make-exn-condition
     
    870872        (sqlite3:reset! stmt)
    871873        r )
    872       (abort (make-no-data-condition 'sqlite3:first-result stmt params)) ) )
     874      (core:abort (make-no-data-condition 'sqlite3:first-result stmt params)) ) )
    873875
    874876(define-method (sqlite3:first-result
     
    886888      (map (cute sqlite3:column-data stmt <>)
    887889           (iota (sqlite3:column-count stmt)))
    888       (abort (make-no-data-condition 'sqlite3:first-row stmt params)) ) )
     890      (core:abort (make-no-data-condition 'sqlite3:first-row stmt params)) ) )
    889891
    890892(define-method (sqlite3:first-row
     
    967969  (check-sqlite3-type 'sqlite3:with-transaction thunk <procedure-class>)
    968970  (unless (memq type '(deferred immediate exclusive))
    969     (abort
     971    (core:abort
    970972     (make-composite-condition
    971973      (make-exn-condition 'sqlite3:with-transaction
  • release/3/sqlite3/trunk/sqlite3.setup

    r9153 r9304  
    1212  `(,so-file
    1313    "sqlite3.html" "egg.jpg")
    14   '((version "2.0.6")
     14  '((version "2.0.7")
    1515    (documentation "sqlite3.html")))
Note: See TracChangeset for help on using the changeset viewer.