From a1f3e5695b9dc3dd1feec2bd6c1498ca006a4283 Mon Sep 17 00:00:00 2001
From: sheeple <sheeple@oberon.local>
Date: Fri, 20 Feb 2009 22:59:01 -0600
Subject: [PATCH] fix circularity in db
---
basis/db/db.factor | 5 +++--
basis/db/errors/errors.factor | 4 +---
basis/db/errors/postgresql/postgresql.factor | 3 ---
basis/db/errors/sqlite/sqlite.factor | 10 ++--------
basis/db/postgresql/postgresql.factor | 7 +++++--
basis/db/sqlite/sqlite.factor | 9 ++++++++-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/basis/db/db.factor b/basis/db/db.factor
index eb06f0c894..96b72b8865 100644
--- a/basis/db/db.factor
+++ b/basis/db/db.factor
@@ -5,14 +5,14 @@ namespaces sequences classes.tuple words strings
tools.walker accessors combinators fry db.errors ;
IN: db
-<PRIVATE
-
TUPLE: db-connection
handle
insert-statements
update-statements
delete-statements ;
+<PRIVATE
+
: new-db-connection ( class -- obj )
new
H{ } clone >>insert-statements
@@ -23,6 +23,7 @@ PRIVATE>
GENERIC: db-open ( db -- db-connection )
HOOK: db-close db-connection ( handle -- )
+HOOK: parse-db-error db-connection ( error -- error' )
: dispose-statements ( assoc -- ) values dispose-each ;
diff --git a/basis/db/errors/errors.factor b/basis/db/errors/errors.factor
index 1d48012cf9..9420dbbfc4 100644
--- a/basis/db/errors/errors.factor
+++ b/basis/db/errors/errors.factor
@@ -1,10 +1,8 @@
! Copyright (C) 2008 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license.
-USING: kernel db.private ;
+USING: kernel ;
IN: db.errors
-HOOK: parse-db-error db-connection ( error -- error' )
-
ERROR: db-error ;
ERROR: sql-error ;
diff --git a/basis/db/errors/postgresql/postgresql.factor b/basis/db/errors/postgresql/postgresql.factor
index 9d88c96cb1..e45ff092e8 100644
--- a/basis/db/errors/postgresql/postgresql.factor
+++ b/basis/db/errors/postgresql/postgresql.factor
@@ -2,6 +2,3 @@
! See http://factorcode.org/license.txt for BSD license.
USING: ;
IN: db.errors.postgresql
-
-M: postgresql-db-connection parse-db-error
- ;
\ No newline at end of file
diff --git a/basis/db/errors/sqlite/sqlite.factor b/basis/db/errors/sqlite/sqlite.factor
index 770a12b2a1..c247a36257 100644
--- a/basis/db/errors/sqlite/sqlite.factor
+++ b/basis/db/errors/sqlite/sqlite.factor
@@ -1,7 +1,7 @@
! Copyright (C) 2009 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators db.errors db.sqlite.private kernel
-sequences peg.ebnf strings ;
+USING: accessors combinators db kernel sequences peg.ebnf
+strings db.errors ;
IN: db.errors.sqlite
ERROR: unparsed-sqlite-error error ;
@@ -23,9 +23,3 @@ SqliteError =
| "no such table: " .+:table
=> [[ table >string <sql-table-missing> ]]
;EBNF
-
-M: sqlite-db-connection parse-db-error
- dup n>> {
- { 1 [ string>> parse-sqlite-sql-error ] }
- [ drop ]
- } case ;
\ No newline at end of file
diff --git a/basis/db/postgresql/postgresql.factor b/basis/db/postgresql/postgresql.factor
index 1f55dcf769..1c39166071 100644
--- a/basis/db/postgresql/postgresql.factor
+++ b/basis/db/postgresql/postgresql.factor
@@ -5,8 +5,8 @@ kernel math math.parser namespaces make prettyprint quotations
sequences debugger db db.postgresql.lib db.postgresql.ffi
db.tuples db.types tools.annotations math.ranges
combinators classes locals words tools.walker db.private
-nmake accessors random db.queries destructors db.tuples.private ;
-USE: tools.walker
+nmake accessors random db.queries destructors db.tuples.private
+db.postgresql ;
IN: db.postgresql
TUPLE: postgresql-db host port pgopts pgtty database username password ;
@@ -280,3 +280,6 @@ M: postgresql-db-connection compound ( string object -- string' )
{ "references" [ >reference-string ] }
[ drop no-compound-found ]
} case ;
+
+M: postgresql-db-connection parse-db-error
+ ;
diff --git a/basis/db/sqlite/sqlite.factor b/basis/db/sqlite/sqlite.factor
index a4adba3473..5b658f36c9 100755
--- a/basis/db/sqlite/sqlite.factor
+++ b/basis/db/sqlite/sqlite.factor
@@ -6,7 +6,8 @@ sequences strings classes.tuple alien.c-types continuations
db.sqlite.lib db.sqlite.ffi db.tuples words db.types combinators
math.intervals io nmake accessors vectors math.ranges random
math.bitwise db.queries destructors db.tuples.private interpolate
-io.streams.string multiline make db.private sequences.deep ;
+io.streams.string multiline make db.private sequences.deep
+db.errors.sqlite ;
IN: db.sqlite
TUPLE: sqlite-db path ;
@@ -347,3 +348,9 @@ M: sqlite-db-connection compound ( string seq -- new-string )
{ "references" [ >reference-string ] }
[ 2drop ]
} case ;
+
+M: sqlite-db-connection parse-db-error
+ dup n>> {
+ { 1 [ string>> parse-sqlite-sql-error ] }
+ [ drop ]
+ } case ;