furnace.db: update for Doug's db fixes

diff --git a/basis/furnace/alloy/alloy-docs.factor b/basis/furnace/alloy/alloy-docs.factor
index f108428c901b09817d4e428c2120800365813be4..f21fc237a8ff4564ff207f9dd697cd3737387269 100644 (file)
--- a/basis/furnace/alloy/alloy-docs.factor
+++ b/basis/furnace/alloy/alloy-docs.factor
@@ -5,7 +5,7 @@ HELP: init-furnace-tables
 { $description "Initializes database tables used by asides, conversations and session management. This word must be invoked inside a " { $link with-db } " scope." } ;
 
 HELP: <alloy>
-{ $values { "responder" "a responder" } { "db" db } { "responder'" "an alloy responder" } }
+{ $values { "responder" "a responder" } { "db" "a database descriptor" } { "responder'" "an alloy responder" } }
 { $description "Wraps the responder with support for asides, conversations, sessions and database persistence." }
 { $examples
     "The " { $vocab-link "webapps.counter" } " vocabulary uses an alloy to configure the counter:"
@@ -21,7 +21,7 @@ HELP: <alloy>
 } ;
 
 HELP: start-expiring
-{ $values { "db" db } }
+{ $values { "db" "a database descriptor" } }
 { $description "Starts a timer which expires old session state from the given database." } ;
 
 ARTICLE: "furnace.alloy" "Furnace alloy responder"

diff --git a/basis/furnace/db/db-docs.factor b/basis/furnace/db/db-docs.factor
index a7ef02b77f545cca678c8f01240b3eb1622b789e..c64356c812e20eecc561cf9d341cf11226c7292e 100644 (file)
--- a/basis/furnace/db/db-docs.factor
+++ b/basis/furnace/db/db-docs.factor
@@ -3,7 +3,7 @@ IN: furnace.db
 
 HELP: <db-persistence>
 { $values
-     { "responder" "a responder" } { "db" db }
+     { "responder" "a responder" } { "db" "a database descriptor" }
      { "responder'" db-persistence }
 }
 { $description "Wraps a responder with database persistence support. The responder's " { $link call-responder* } " method will run in a " { $link with-db } " scope." } ;

diff --git a/basis/furnace/db/db.factor b/basis/furnace/db/db.factor
index ed18e42a4fe8c767aa26d34ffd8eff65dc91a432..d771d1d2d79abb6329f67c839233b9460a357438 100644 (file)
--- a/basis/furnace/db/db.factor
+++ b/basis/furnace/db/db.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 USING: kernel accessors continuations namespaces destructors\r
-db db.pools io.pools http.server http.server.filters ;\r
+db db.private db.pools io.pools http.server http.server.filters ;\r
 IN: furnace.db\r
 \r
 TUPLE: db-persistence < filter-responder pool ;\r
@@ -12,6 +12,6 @@ TUPLE: db-persistence < filter-responder pool ;
 M: db-persistence call-responder*\r
     [\r
         pool>> [ acquire-connection ] keep\r
-        [ return-connection-later ] [ drop db set ] 2bi\r
+        [ return-connection-later ] [ drop db-connection set ] 2bi\r
     ]\r
     [ call-next-method ] bi ;\r