From 869fbf27a1e3a816847e3fbd5edbe3304f1e1baf Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 4 Dec 2008 00:06:02 -0600 Subject: [PATCH 1/2] remove join-space from db --- basis/db/postgresql/postgresql.factor | 2 +- basis/db/sqlite/sqlite.factor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/db/postgresql/postgresql.factor b/basis/db/postgresql/postgresql.factor index 57a16fc8ef..82d96c4af1 100644 --- a/basis/db/postgresql/postgresql.factor +++ b/basis/db/postgresql/postgresql.factor @@ -266,7 +266,7 @@ M: postgresql-db persistent-table ( -- hashtable ) ERROR: no-compound-found string object ; M: postgresql-db compound ( string object -- string' ) over { - { "default" [ first number>string join-space ] } + { "default" [ first number>string " " glue ] } { "varchar" [ first number>string paren append ] } { "references" [ >reference-string ] } [ drop no-compound-found ] diff --git a/basis/db/sqlite/sqlite.factor b/basis/db/sqlite/sqlite.factor index c22bb3a2d8..4e96fb5a4d 100644 --- a/basis/db/sqlite/sqlite.factor +++ b/basis/db/sqlite/sqlite.factor @@ -308,7 +308,7 @@ M: sqlite-db persistent-table ( -- assoc ) M: sqlite-db compound ( string seq -- new-string ) over { - { "default" [ first number>string join-space ] } + { "default" [ first number>string " " glue ] } { "references" [ [ >reference-string ] keep first2 [ "foreign-table" set ] From d698e3e5781bef089f1e8787e6a178da761dd502 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 4 Dec 2008 00:08:20 -0600 Subject: [PATCH 2/2] add using --- extra/webapps/wee-url/wee-url.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/webapps/wee-url/wee-url.factor b/extra/webapps/wee-url/wee-url.factor index af7c8b61ce..bc429a0af6 100644 --- a/extra/webapps/wee-url/wee-url.factor +++ b/extra/webapps/wee-url/wee-url.factor @@ -1,11 +1,11 @@ ! Copyright (C) 2007 Doug Coleman. ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: math.ranges sequences random accessors combinators.lib +USING: math.ranges sequences random accessors kernel namespaces fry db.types db.tuples urls validators html.components html.forms http http.server.dispatchers furnace furnace.actions furnace.boilerplate furnace.redirection -furnace.utilities ; +furnace.utilities continuations ; IN: webapps.wee-url TUPLE: wee-url < dispatcher ;