db: update for ERROR: change

diff --git a/basis/db/errors/errors.factor b/basis/db/errors/errors.factor
index 5239086f939a2a298784413788c508f5a0f3db29..23e88ea940e46341790dba468d189b755efc0291 100644 (file)
--- 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 ;
 : <sql-unknown-error> ( message -- error )
     \ sql-unknown-error new
         swap >>message ;
 
-ERROR: sql-table-exists < sql-error table ;
+TUPLE: sql-table-exists < sql-error table ;
 : <sql-table-exists> ( table -- error )
     \ sql-table-exists new
         swap >>table ;
 
-ERROR: sql-table-missing < sql-error table ;
+TUPLE: sql-table-missing < sql-error table ;
 : <sql-table-missing> ( table -- error )
     \ sql-table-missing new
         swap >>table ;
 
-ERROR: sql-syntax-error < sql-error message ;
+TUPLE: sql-syntax-error < sql-error message ;
 : <sql-syntax-error> ( message -- error )
     \ sql-syntax-error new
         swap >>message ;
 
-ERROR: sql-function-exists < sql-error message ;
+TUPLE: sql-function-exists < sql-error message ;
 : <sql-function-exists> ( message -- error )
     \ sql-function-exists new
         swap >>message ;
 
-ERROR: sql-function-missing < sql-error message ;
+TUPLE: sql-function-missing < sql-error message ;
 : <sql-function-missing> ( 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 53034d148ab5aa194429655b8b5ad8182bd48b4e..b8e56863c3d6ab25fd2e17c25dd7515bed163ee4 100644 (file)
--- 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 ;
 
-: <sqlite-sql-error> ( 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 <sqlite-sql-error> throw ;
+    db-connection get handle>> sqlite3_errmsg sqlite-sql-error ;
 
 : sqlite-check-result ( n -- )
     {