From 0177b77a01bc5066a0494c38101f4d1769d72175 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 11 Mar 2016 00:57:35 -0800 Subject: [PATCH] furnace: clean up using. --- basis/furnace/auth/providers/db/db-tests.factor | 13 +++++-------- basis/furnace/sessions/sessions-docs.factor | 2 +- basis/furnace/sessions/sessions-tests.factor | 2 +- extra/webapps/mason/backend/backend-tests.factor | 6 +++--- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/basis/furnace/auth/providers/db/db-tests.factor b/basis/furnace/auth/providers/db/db-tests.factor index 41c8cfda39..ee8f9bc7f4 100644 --- a/basis/furnace/auth/providers/db/db-tests.factor +++ b/basis/furnace/auth/providers/db/db-tests.factor @@ -1,11 +1,8 @@ -USING: furnace.actions -furnace.auth -furnace.auth.login -furnace.auth.providers -furnace.auth.providers.db tools.test -namespaces db db.sqlite db.tuples continuations -io.files io.files.temp io.directories accessors kernel -sequences system ; +USING: accessors continuations db2.connections furnace.actions +furnace.auth furnace.auth.login furnace.auth.providers +furnace.auth.providers.db io.directories io.files io.files.temp +kernel namespaces orm.tuples sequences sqlite.db2 system +tools.test ; IN: furnace.auth.providers.db.tests "test" realm set diff --git a/basis/furnace/sessions/sessions-docs.factor b/basis/furnace/sessions/sessions-docs.factor index e272f36fa1..7def6043c4 100644 --- a/basis/furnace/sessions/sessions-docs.factor +++ b/basis/furnace/sessions/sessions-docs.factor @@ -36,7 +36,7 @@ $nl { $list "Continuations cannot be stored at all." { "Object identity is not preserved between serialization and deserialization. That is, if an object is stored with " { $link sset } " and later retrieved with " { $link sget } ", the retrieved value will be " { $link = } " to the original, but not necessarily " { $link eq? } "." } - { "All objects reachable from the value passed to " { $link sset } " are serialized, so large structures should not be stored in the session state, and neither should anything that can reference the global namespace. Large structures should be persisted in the database directly instead, using " { $vocab-link "db.tuples" } "." } + { "All objects reachable from the value passed to " { $link sset } " are serialized, so large structures should not be stored in the session state, and neither should anything that can reference the global namespace. Large structures should be persisted in the database directly instead, using " { $vocab-link "orm.tuples" } "." } } ; ARTICLE: "furnace.sessions" "Furnace sessions" diff --git a/basis/furnace/sessions/sessions-tests.factor b/basis/furnace/sessions/sessions-tests.factor index 479a5caa6e..a0b6d83d21 100644 --- a/basis/furnace/sessions/sessions-tests.factor +++ b/basis/furnace/sessions/sessions-tests.factor @@ -2,7 +2,7 @@ USING: tools.test http furnace.sessions furnace.actions http.server http.server.responses math namespaces make kernel accessors io.sockets io.servers prettyprint io.streams.string io.files io.files.temp io.directories -splitting destructors sequences db db.tuples db.sqlite +splitting destructors sequences orm.tuples sqlite.db2 db2.connections continuations urls math.parser furnace furnace.utilities ; IN: furnace.sessions.tests diff --git a/extra/webapps/mason/backend/backend-tests.factor b/extra/webapps/mason/backend/backend-tests.factor index 9f4b09df4d..5025978d03 100644 --- a/extra/webapps/mason/backend/backend-tests.factor +++ b/extra/webapps/mason/backend/backend-tests.factor @@ -1,8 +1,8 @@ -USING: continuations db io.directories io.files.temp tools.test -webapps.mason.backend webapps.utils ; +USING: continuations io.directories io.files.temp tools.test +webapps.mason.backend webapps.utils db2.transactions db2.connections ; IN: webapps.mason.backend.tests -[ "mason-test.db" temp-file delete-file ] ignore-errors +[ "resource:mason-test.db" temp-file delete-file ] ignore-errors { 0 1 2 } [ ! Do it in a with-transaction to simulate semantics of