From 354d85342e11f5465432e43662809fc5763d2af0 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 4 Feb 2008 13:57:22 -0600
Subject: [PATCH] remove dependency on sqlite3 binary

---
 extra/db/sqlite/sqlite-tests.factor | 45 +++++++++--------------------
 1 file changed, 13 insertions(+), 32 deletions(-)

diff --git a/extra/db/sqlite/sqlite-tests.factor b/extra/db/sqlite/sqlite-tests.factor
index aa7168530b..c6576dcd62 100644
--- a/extra/db/sqlite/sqlite-tests.factor
+++ b/extra/db/sqlite/sqlite-tests.factor
@@ -3,40 +3,26 @@ prettyprint tools.test db.sqlite db sequences
 continuations ;
 IN: temporary
 
-! "sqlite3 -init test.txt test.db"
-
-IN: scratchpad
 : test.db "extra/db/sqlite/test.db" resource-path ;
 
-IN: temporary
-: (create-db) ( -- str )
-    [
-        "sqlite3 -init " %
-        test.db %
-        " " %
-        test.db %
-    ] "" make ;
+[ ] [ [ test.db delete-file ] catch drop ] unit-test
 
-: create-db ( -- ) (create-db) run-process drop ;
+[ ] [
+    test.db [
+        "create table person (name varchar(30), country varchar(30))" sql-command
+        "insert into person values('John', 'America')" sql-command
+        "insert into person values('Jane', 'New Zealand')" sql-command
+    ] with-sqlite
+] unit-test
 
-[ ] [ test.db delete-file ] unit-test
 
-[ ] [ create-db ] unit-test
-
-[
-    {
-        { "John" "America" }
-        { "Jane" "New Zealand" }
-    }
-] [
+[ { { "John" "America" } { "Jane" "New Zealand" } } ] [
     test.db [
         "select * from person" sql-query
     ] with-sqlite
 ] unit-test
 
-[
-    { { "John" "America" } }
-] [
+[ { { "John" "America" } } ] [
     test.db [
         "select * from person where name = :name and country = :country"
         <simple-statement> [
@@ -52,15 +38,10 @@ IN: temporary
     ] with-sqlite
 ] unit-test
 
-[
-    {
-        { "1" "John" "America" }
-        { "2" "Jane" "New Zealand" }
-    }
-] [ test.db [ "select rowid, * from person" sql-query ] with-sqlite ] unit-test
+[ { { "1" "John" "America" } { "2" "Jane" "New Zealand" } } ]
+[ test.db [ "select rowid, * from person" sql-query ] with-sqlite ] unit-test
 
-[
-] [
+[ ] [
     test.db [
         "insert into person(name, country) values('Jimmy', 'Canada')"
         sql-command