steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

db: update for ERROR: change

db4
Slava Pestov 2010-02-02 09:40:56 +13:00
parent 0438e4983b
commit 7846074b3b
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
basis/db/errors/errors.factor
View File

@ -8,32 +8,32 @@ ERROR: sql-error location ;
ERROR: bad-schema ; ERROR: bad-schema ;
ERROR: sql-unknown-error < sql-error message ; TUPLE: sql-unknown-error < sql-error message ;
: <sql-unknown-error> ( message -- error ) : <sql-unknown-error> ( message -- error )
\ sql-unknown-error new \ sql-unknown-error new
swap >>message ; swap >>message ;
ERROR: sql-table-exists < sql-error table ; TUPLE: sql-table-exists < sql-error table ;
: <sql-table-exists> ( table -- error ) : <sql-table-exists> ( table -- error )
\ sql-table-exists new \ sql-table-exists new
swap >>table ; swap >>table ;
ERROR: sql-table-missing < sql-error table ; TUPLE: sql-table-missing < sql-error table ;
: <sql-table-missing> ( table -- error ) : <sql-table-missing> ( table -- error )
\ sql-table-missing new \ sql-table-missing new
swap >>table ; swap >>table ;
ERROR: sql-syntax-error < sql-error message ; TUPLE: sql-syntax-error < sql-error message ;
: <sql-syntax-error> ( message -- error ) : <sql-syntax-error> ( message -- error )
\ sql-syntax-error new \ sql-syntax-error new
swap >>message ; swap >>message ;
ERROR: sql-function-exists < sql-error message ; TUPLE: sql-function-exists < sql-error message ;
: <sql-function-exists> ( message -- error ) : <sql-function-exists> ( message -- error )
\ sql-function-exists new \ sql-function-exists new
swap >>message ; swap >>message ;
ERROR: sql-function-missing < sql-error message ; TUPLE: sql-function-missing < sql-error message ;
: <sql-function-missing> ( message -- error ) : <sql-function-missing> ( message -- error )
\ sql-function-missing new \ sql-function-missing new
swap >>message ; swap >>message ;

7
basis/db/sqlite/lib/lib.factor
View File

@ -11,17 +11,12 @@ IN: db.sqlite.lib
ERROR: sqlite-error < db-error n string ; ERROR: sqlite-error < db-error n string ;
ERROR: sqlite-sql-error < sql-error n string ; ERROR: sqlite-sql-error < sql-error n string ;
: <sqlite-sql-error> ( n string -- error )
\ sqlite-sql-error new
swap >>string
swap >>n ;
: throw-sqlite-error ( n -- * ) : throw-sqlite-error ( n -- * )
dup sqlite-error-messages nth sqlite-error ; dup sqlite-error-messages nth sqlite-error ;
: sqlite-statement-error ( -- * ) : sqlite-statement-error ( -- * )
SQLITE_ERROR SQLITE_ERROR
db-connection get handle>> sqlite3_errmsg <sqlite-sql-error> throw ; db-connection get handle>> sqlite3_errmsg sqlite-sql-error ;
: sqlite-check-result ( n -- ) : sqlite-check-result ( n -- )
{ {