diff --git a/basis/db/errors/errors.factor b/basis/db/errors/errors.factor index 5239086f93..23e88ea940 100644 --- a/basis/db/errors/errors.factor +++ b/basis/db/errors/errors.factor @@ -8,32 +8,32 @@ ERROR: sql-error location ; ERROR: bad-schema ; -ERROR: sql-unknown-error < sql-error message ; +TUPLE: sql-unknown-error < sql-error message ; : ( message -- error ) \ sql-unknown-error new swap >>message ; -ERROR: sql-table-exists < sql-error table ; +TUPLE: sql-table-exists < sql-error table ; : ( table -- error ) \ sql-table-exists new swap >>table ; -ERROR: sql-table-missing < sql-error table ; +TUPLE: sql-table-missing < sql-error table ; : ( table -- error ) \ sql-table-missing new swap >>table ; -ERROR: sql-syntax-error < sql-error message ; +TUPLE: sql-syntax-error < sql-error message ; : ( message -- error ) \ sql-syntax-error new swap >>message ; -ERROR: sql-function-exists < sql-error message ; +TUPLE: sql-function-exists < sql-error message ; : ( message -- error ) \ sql-function-exists new swap >>message ; -ERROR: sql-function-missing < sql-error message ; +TUPLE: sql-function-missing < sql-error message ; : ( message -- error ) \ sql-function-missing new swap >>message ; diff --git a/basis/db/sqlite/lib/lib.factor b/basis/db/sqlite/lib/lib.factor index 53034d148a..b8e56863c3 100644 --- a/basis/db/sqlite/lib/lib.factor +++ b/basis/db/sqlite/lib/lib.factor @@ -11,17 +11,12 @@ IN: db.sqlite.lib ERROR: sqlite-error < db-error n string ; ERROR: sqlite-sql-error < sql-error n string ; -: ( n string -- error ) - \ sqlite-sql-error new - swap >>string - swap >>n ; - : throw-sqlite-error ( n -- * ) dup sqlite-error-messages nth sqlite-error ; : sqlite-statement-error ( -- * ) SQLITE_ERROR - db-connection get handle>> sqlite3_errmsg throw ; + db-connection get handle>> sqlite3_errmsg sqlite-sql-error ; : sqlite-check-result ( n -- ) {