moved patterns to persistency for new db prep

diff --git a/basis/db/queries/queries.factor b/basis/db/queries/queries.factor
index d2674205b1f47eb87831e0bb8479c490129ce219..c4aa47d383b3a1281ff091887449bb6e6ad39be6 100755 (executable)
--- 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 1604c66b402420235a336de86b76b7acd998b0c0..f459eca7e442bf4029fb4a52e9f6efbd1e6f1ad2 100644 (file)
--- 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 5681e4395e5ce1471f949e706cdc1635cbdf2038..d54685958928a82169d07b5ba8dd782c1f1b5e68 100644 (file)
--- 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