From e426bc4be893c029a5744a192dfbd317a955a726 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Wed, 5 Aug 2009 16:45:22 -0500
Subject: [PATCH] moved patterns to persistency for new db prep

---
 basis/db/queries/queries.factor      |  6 +-----
 extra/persistency/persistency.factor | 13 +++++++++----
 extra/recipes/recipes.factor         |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/basis/db/queries/queries.factor b/basis/db/queries/queries.factor
index d2674205b1..c4aa47d383 100755
--- a/basis/db/queries/queries.factor
+++ b/basis/db/queries/queries.factor
@@ -4,7 +4,7 @@ USING: accessors kernel math namespaces make sequences random
 strings math.parser math.intervals combinators math.bitwise
 nmake db db.tuples db.types classes words shuffle arrays
 destructors continuations db.tuples.private prettyprint
-db.private byte-arrays strings.parser parser ;
+db.private byte-arrays ;
 IN: db.queries
 
 GENERIC: where ( specs obj -- )
@@ -130,10 +130,6 @@ M: integer where ( spec obj -- ) object-where ;
 
 M: string where ( spec obj -- ) object-where ;
 
-TUPLE: pattern value ; C: <pattern> pattern
-SYNTAX: %" parse-string <pattern> parsed ;
-M: pattern where value>> over column-name>> 0% " LIKE " 0% bind# ;
-
 : filter-slots ( tuple specs -- specs' )
     [
         slot-name>> swap get-slot-named
diff --git a/extra/persistency/persistency.factor b/extra/persistency/persistency.factor
index 1604c66b40..f459eca7e4 100644
--- a/extra/persistency/persistency.factor
+++ b/extra/persistency/persistency.factor
@@ -1,6 +1,7 @@
-USING: accessors arrays byte-arrays calendar classes classes.tuple
-classes.tuple.parser combinators db db.tuples db.types kernel
-math sequences strings unicode.case urls words ;
+USING: accessors arrays byte-arrays calendar classes
+classes.tuple classes.tuple.parser combinators db db.queries
+db.tuples db.types kernel math nmake parser sequences strings
+strings.parser unicode.case urls words ;
 IN: persistency
 
 TUPLE: persistent id ;
@@ -22,4 +23,8 @@ SYNTAX: STORED-TUPLE: parse-tuple-definition [ drop persistent ] dip [ remove-ty
 : get-tuple ( query -- tuple ) [ select-tuple ] w/db ;
 : store-tuple ( tuple -- ) [ insert-tuple ] w/db ;
 : modify-tuple ( tuple -- ) [ update-tuple ] w/db ;
-: remove-tuples ( tuple -- ) [ delete-tuples ] w/db ;
\ No newline at end of file
+: remove-tuples ( tuple -- ) [ delete-tuples ] w/db ;
+    
+TUPLE: pattern value ; C: <pattern> pattern
+SYNTAX: %" parse-string <pattern> parsed ;
+M: pattern where value>> over column-name>> 0% " LIKE " 0% bind# ;
diff --git a/extra/recipes/recipes.factor b/extra/recipes/recipes.factor
index 5681e4395e..d546859589 100644
--- a/extra/recipes/recipes.factor
+++ b/extra/recipes/recipes.factor
@@ -1,4 +1,4 @@
-USING: accessors arrays colors.constants combinators db.queries
+USING: accessors arrays colors.constants combinators
 db.sqlite db.tuples db.types kernel locals math
 monads persistency sequences sequences.extras ui ui.gadgets.controls
 ui.gadgets.layout models.combinators ui.gadgets.labels