Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-12-04 00:33:04 -06:00
commit 22aaf2253e
3 changed files with 4 additions and 4 deletions

View File

@ -266,7 +266,7 @@ M: postgresql-db persistent-table ( -- hashtable )
ERROR: no-compound-found string object ; ERROR: no-compound-found string object ;
M: postgresql-db compound ( string object -- string' ) M: postgresql-db compound ( string object -- string' )
over { over {
{ "default" [ first number>string join-space ] } { "default" [ first number>string " " glue ] }
{ "varchar" [ first number>string paren append ] } { "varchar" [ first number>string paren append ] }
{ "references" [ >reference-string ] } { "references" [ >reference-string ] }
[ drop no-compound-found ] [ drop no-compound-found ]

View File

@ -308,7 +308,7 @@ M: sqlite-db persistent-table ( -- assoc )
M: sqlite-db compound ( string seq -- new-string ) M: sqlite-db compound ( string seq -- new-string )
over { over {
{ "default" [ first number>string join-space ] } { "default" [ first number>string " " glue ] }
{ "references" [ { "references" [
[ >reference-string ] keep [ >reference-string ] keep
first2 [ "foreign-table" set ] first2 [ "foreign-table" set ]

View File

@ -1,11 +1,11 @@
! Copyright (C) 2007 Doug Coleman. ! Copyright (C) 2007 Doug Coleman.
! Copyright (C) 2008 Slava Pestov. ! Copyright (C) 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! 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 kernel namespaces fry db.types db.tuples urls validators
html.components html.forms http http.server.dispatchers furnace html.components html.forms http http.server.dispatchers furnace
furnace.actions furnace.boilerplate furnace.redirection furnace.actions furnace.boilerplate furnace.redirection
furnace.utilities ; furnace.utilities continuations ;
IN: webapps.wee-url IN: webapps.wee-url
TUPLE: wee-url < dispatcher ; TUPLE: wee-url < dispatcher ;