db.sqlite.errors: simplify implementation

diff --git a/basis/db/sqlite/errors/errors.factor b/basis/db/sqlite/errors/errors.factor
index 1e5da3ca948c39f069a750d097c1eb7b89a7c3e9..ca55c3a8ca4e04a3711a9a4fda6ea17c34500ffb 100644 (file)
--- a/basis/db/sqlite/errors/errors.factor
+++ b/basis/db/sqlite/errors/errors.factor
@@ -7,20 +7,13 @@ IN: db.sqlite.errors
 TUPLE: unparsed-sqlite-error error ;
 C: <unparsed-sqlite-error> unparsed-sqlite-error
 
-SINGLETONS: table-exists table-missing ;
-
-: sqlite-table-error ( table message -- error )
-    {
-        { table-exists [ <sql-table-exists> ] }
-    } case ;
-
 EBNF: parse-sqlite-sql-error
 
-TableMessage = " already exists" => [[ table-exists ]]
+AlreadyExists = " already exists"
 
 SqliteError =
-    "table " (!(TableMessage).)+:table TableMessage:message
-      => [[ table >string message sqlite-table-error ]]
+    "table " (!(AlreadyExists).)+:table AlreadyExists
+      => [[ table >string <sql-table-exists> ]]
     | "no such table: " .+:table
       => [[ table >string <sql-table-missing> ]]
     | .*:error