From ca19a01c1b411f7d657ae4c60e01e2e48b3984e2 Mon Sep 17 00:00:00 2001
From: Alexander Iljin <ajsoft@yandex.ru>
Date: Sat, 20 Feb 2016 21:07:42 +0400
Subject: [PATCH] db.sqlite.errors: simplify implementation

---
 basis/db/sqlite/errors/errors.factor | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/basis/db/sqlite/errors/errors.factor b/basis/db/sqlite/errors/errors.factor
index 1e5da3ca94..ca55c3a8ca 100644
--- 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