diff options
| author | Stuart Sierra <mail@stuartsierra.com> | 2010-10-02 18:51:29 -0400 |
|---|---|---|
| committer | Stuart Sierra <mail@stuartsierra.com> | 2010-10-02 18:51:29 -0400 |
| commit | f6ef99e78156d7f39ce91138183654c7f9205e24 (patch) | |
| tree | e07be92bf788f4de98bd227b86cde5511ce47360 | |
| parent | 3eb423cfaf38f1059c91d083cab11bba7c15ccb3 (diff) | |
| parent | 8bb336e9160e58cf411ce249cb6acd9a34106287 (diff) | |
Merge branch 'master' of github.com:clojure/clojure-contrib
| -rw-r--r-- | doc/datalog.markdown | 4 | ||||
| -rw-r--r-- | modules/sql/src/main/clojure/clojure/contrib/sql.clj | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/datalog.markdown b/doc/datalog.markdown index 709ec72b..83c3a091 100644 --- a/doc/datalog.markdown +++ b/doc/datalog.markdown @@ -15,7 +15,7 @@ The implementation of Datalog that is provided (in this library) departs a bit f ### The Database ### -Clojure Datalog supports an in memory relational database format, implemented in clojure.contrib.datalog.database ([here](http://github.com/richhickey/clojure-contrib/blob/master/src/clojure/contrib/datalog/database.clj)). It supports relations (tables) with named columns and simple hash based indexes. At the present time it does not support any integrity constraints (perhaps later). +Clojure Datalog supports an in memory relational database format, implemented in clojure.contrib.datalog.database ([here](http://github.com/richhickey/clojure-contrib/blob/master/src/clojure/contrib/datalog/database.cl)). It supports relations (tables) with named columns and simple hash based indexes. At the present time it does not support any integrity constraints (perhaps later). Tables are built with `make-database`, like this: @@ -140,6 +140,6 @@ Where wp is the result of (build-work-plan ...) and db is a database. The last ### Examples ### -A completed example is provided at [http://github.com/richhickey/clojure-contrib/blob/master/src/clojure/contrib/datalog/example.clj](http://github.com/richhickey/clojure-contrib/blob/master/src/clojure/contrib/datalog/example.clj). +A completed example is provided at [http://github.com/clojure/clojure-contrib/blob/master/modules/datalog/src/examples/clojure/examples/datalog.clj](http://github.com/clojure/clojure-contrib/blob/master/modules/datalog/src/examples/clojure/examples/datalog.clj). diff --git a/modules/sql/src/main/clojure/clojure/contrib/sql.clj b/modules/sql/src/main/clojure/clojure/contrib/sql.clj index 5bc530af..3be4c10a 100644 --- a/modules/sql/src/main/clojure/clojure/contrib/sql.clj +++ b/modules/sql/src/main/clojure/clojure/contrib/sql.clj @@ -18,7 +18,7 @@ (ns ^{:author "Stephen C. Gilardi", :doc "A Clojure interface to sql databases via jdbc." - :see-also [["http://github.com/richhickey/clojure-contrib/blob/master/src/test/clojure/clojure/contrib/test_sql.clj" + :see-also [["http://github.com/clojure/clojure-contrib/blob/master/modules/sql/src/test/clojure/clojure/contrib/test_sql.clj" "Example code"]]} clojure.contrib.sql (:use (clojure.contrib [def :only (defalias)]) |